From 7c9373a305e8d889cf386eedbcf06bd8291f5c28 Mon Sep 17 00:00:00 2001 From: ZQN <364596817@qq.com> Date: 星期二, 25 六月 2024 10:31:01 +0800 Subject: [PATCH] 多机构管理修改 --- project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 3 ++- project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java | 18 +++++++++--------- project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java | 25 +++++++++++++++++-------- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java index 31b5c40..dce177b 100644 --- a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java +++ b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java @@ -113,7 +113,7 @@ @PostMapping public AjaxResult add(@Validated @RequestBody SysUser user) { - + user.setPassword(user.getPhonenumber()); if (user.getDeptId()!=null){ user.setUserType("01"); SysDept sysDept = deptService.selectDeptById(user.getDeptId()); @@ -154,6 +154,7 @@ { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); + user.setPassword(user.getPhonenumber()); if (user.getDeptId()!=null){ SysDept sysDept = deptService.selectDeptById(user.getDeptId()); if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){ diff --git a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java index c8fa078..20b0d8f 100644 --- a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java +++ b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java @@ -60,15 +60,15 @@ int complaintNum = complaintLogService.count(); int docNum = docService.count(docService.lq().eq(SysDoc::getDocStatus,0)); Map<String, Object> result = new HashMap<>(7); - result.put("companyNum", companyNum); - result.put("enforceCompanyNum", enforceCompanyNum); - result.put("enforceDeptNum", enforceDeptNum); - result.put("enforceUserNum", enforceUserNum); - result.put("enforceOrderNum", enforceOrderNum); - result.put("enforceOrderCheckedNum", enforceOrderCheckedNum); - result.put("enforceOrderCompleteNum", enforceOrderCompleteNum); - result.put("complaintNum", complaintNum); - result.put("docNum", docNum); + result.put("companyNum", companyNum); //浼佷笟鏁� + result.put("enforceCompanyNum", enforceCompanyNum);//琚墽娉曚紒涓氭暟 + result.put("enforceDeptNum", enforceDeptNum);//鎵ф硶鍗曚綅 + result.put("enforceUserNum", enforceUserNum);//鎵ф硶浜哄憳 + result.put("enforceOrderNum", enforceOrderNum);//鎵ф硶鍗曟�绘暟 + result.put("enforceOrderCheckedNum", enforceOrderCheckedNum);//宸插鎵规墽娉曞崟鏁� + result.put("enforceOrderCompleteNum", enforceOrderCompleteNum);//鎵ф硶鍗曞畬鎴愭暟 + result.put("complaintNum", complaintNum);//鎶曡瘔鏁� + result.put("docNum", docNum);//鏀跨瓥鏁� return result; } diff --git a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java index e928983..2653a70 100644 --- a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java +++ b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java @@ -16,6 +16,7 @@ import com.project.common.utils.bean.BeanValidators; import com.project.common.utils.spring.SpringUtils; import com.project.system.domain.*; +import com.project.system.domain.bo.editBo.UserDeptBo; import com.project.system.domain.vo.SysUserResultVo; import com.project.system.domain.vo.SysUserVo; import com.project.system.mapper.*; @@ -296,9 +297,9 @@ userPostMapper.deleteUserPostByUserId(userId); // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞� insertUserPost(user); - + SysUser old = this.selectUserById(userId); // 鏂板鐢ㄦ埛涓庨儴闂ㄧ鐞� - if (!"02".equals(user.getUserType())){ + if (!"02".equals(user.getUserType()) && !old.getDeptId().equals(user.getDeptId())){ insertUserDept(user); } return userMapper.updateUser(user); @@ -397,12 +398,20 @@ */ public void insertUserDept(SysUser user) { - userDeptService.remove(userDeptService.lq() - .eq(SysUserDept::getUserId, user.getUserId()) - .eq(SysUserDept::getDeptId, user.getDeptId()) - ); - SysUserDept userDept = new SysUserDept().setUserId(user.getUserId()).setDeptId(user.getDeptId()); - userDeptService.save(userDept); + if (deptService.getCheckDeptIdByLoginDeptId(user.getDeptId()).equals(user.getDeptId())) { //鍒嗙灞�鍐呮墍鏈夐儴闂� + List<SysDept> list = deptService.list(deptService.lq().eq(SysDept::getParentId, user.getDeptId())); + List<Long> deptIds = list.stream().map(SysDept::getDeptId).collect(Collectors.toList()); + deptIds.add(user.getDeptId()); + UserDeptBo bo = new UserDeptBo(); + bo.setUserId(user.getUserId()); + bo.setDeptIds(deptIds); + userDeptService.batchUserDeptSave(bo); + } else { //鍒嗙鍗曠嫭閮ㄩ棬 + userDeptService.remove(userDeptService.lq().eq(SysUserDept::getUserId, user.getUserId())); + SysUserDept userDept = new SysUserDept().setUserId(user.getUserId()).setDeptId(user.getDeptId()); + userDeptService.save(userDept); + } + } /** -- Gitblit v1.9.1