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)){ 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; }
@@ -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); } } /**
