diff --git a/src/main/java/com/gaotao/modules/finishedProduct/controller/WarehouseController.java b/src/main/java/com/gaotao/modules/finishedProduct/controller/WarehouseController.java index e00af73..6bdfbad 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/controller/WarehouseController.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/controller/WarehouseController.java @@ -8,6 +8,7 @@ import com.gaotao.modules.finishedProduct.service.WarehouseService; import com.gaotao.modules.factory.service.AccessWarehouseService; import com.gaotao.modules.sys.controller.AbstractController; import com.gaotao.modules.sys.entity.SysUserEntity; +import com.gaotao.modules.sys.service.SysUserService; import com.gaotao.modules.toolman.entity.WareHouseData; import com.gaotao.modules.toolman.query.LocationQuery; import com.gaotao.modules.toolman.service.LocationService; @@ -36,6 +37,8 @@ public class WarehouseController extends AbstractController { private LocationService locationService; @Autowired private AccessWarehouseService accessWarehouseService; + @Autowired + private SysUserService sysUserService; /* * @Author sxm @@ -287,4 +290,22 @@ public class WarehouseController extends AbstractController { return R.error("删除权限授权失败: " + e.getMessage()); } } + + /** + * 获取可选用户列表(权限授权用),不受 sys:user:list 权限限制, + * 所有已登录用户均可调用,仅返回同 site 下状态正常的用户。 + */ + @PostMapping("getAvailableUserList") + public R getAvailableUserList(@RequestBody Map params) { + try { + SysUserEntity query = new SysUserEntity(); + query.setSite((String) params.get("site")); + query.setStatus(1); + List list = sysUserService.userList(query); + return R.ok().put("list", list); + } catch (Exception e) { + logger.error("获取可选用户列表失败", e); + return R.error("获取可选用户列表失败"); + } + } }