diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index d98b8189..6d97faae 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -55,6 +55,9 @@ public class SysUserController extends BaseController { @Resource private AuthAdminService authAdminService; + @Resource + private DeptService deptService; + @GetMapping("/list") public BaseResponse list(FilterAuthUserRequest filterAuthUserRequest, BindingResult bindingResult) { @@ -77,10 +80,16 @@ public class SysUserController extends BaseController { List depts = new ArrayList<>(); String deptName = ""; for (DeptUserResponse deptUserResponse : deptUserResponses) { - depts.add(deptUserResponse.getDeptId()); - deptName = deptName + "," + deptUserResponse.getDeptName(); + if(deptUserResponse.getDeptId()!=1){ + depts.add(deptUserResponse.getDeptId()); + deptName = deptName + "," + deptUserResponse.getDeptName(); + } + } + if(deptName.length()!=0){ + authAdminResponse.setDeptName(deptName.substring(1)); + }else{ + authAdminResponse.setDeptName(deptName); } - authAdminResponse.setDeptName(deptName.substring(1)); authAdminResponse.setDepts(depts); } authAdminResponse.setRoles(roles); @@ -199,6 +208,11 @@ public class SysUserController extends BaseController { // sysUserRole.setUserId(authAdmin.getId()); // sysUserRole.setRoleId(sysUserRole1.getRoleId()); // userService.insertUserAuth1(sysUserRole); + //默认插入第一部门 + List deptCodeList=authUserSaveRequest.getDepts(); + deptCodeList.add(1L); + authUserSaveRequest.setDepts(deptCodeList); + //插入部门 @@ -276,6 +290,11 @@ public class SysUserController extends BaseController { userService.updateAuthAdmin(authAdmin); + //默认插入第一部门 + List deptCodeList=authUserSaveRequest.getDepts(); + deptCodeList.add(1L); + authUserSaveRequest.setDepts(deptCodeList); + //修改所属部门 deptUserService.deleteByUser(authUserSaveRequest.getId()); if (CollUtil.isNotEmpty(authUserSaveRequest.getDepts())) {