diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDept.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDept.java index 5be5f44b..ea00915d 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDept.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDept.java @@ -47,7 +47,7 @@ public class SysDept extends TenantEntity { /** * 负责人 */ - private Long leader; + private String leader; /** * 联系电话 diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/service/impl/SysTenantServiceImpl.java index 46091695..11f60bed 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -160,7 +160,7 @@ public class SysTenantServiceImpl implements ISysTenantService { userMapper.insert(user); //新增系统用户后,默认当前用户为部门的负责人 SysDept sd = new SysDept(); - sd.setLeader(user.getUserId()); + sd.setLeader(String.valueOf(user.getUserId())); sd.setDeptId(deptId); deptMapper.updateById(sd); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java index 04e5c0d8..ddc79604 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java @@ -322,4 +322,19 @@ public class SysUserController extends BaseController { return R.ok(trees); } + + /** + * 根据部门ID统计用户数量 /system/user/list/dept/ + * + * @param deptId 部门ID + */ + @SaCheckPermission("system:user:list:dept") + @GetMapping("/list/dept/{deptId}") + public R> countUsersByDept(@PathVariable Long deptId) { + SysUserBo user = new SysUserBo(); + user.setDeptId(deptId); + List userList = userService.selectUserList(user); + return R.ok(userList); + } + }