Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

用户管理：移除岗位入库和岗位检查

Browse Source
This commit is contained in:
gaoqr
2025-03-12 10:44:59 +08:00
parent 8b1d81eefc
commit 471f908f88
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
+4 -10
View File
@@ -153,8 +153,7 @@ public class AdminUserServiceImpl implements AdminUserService {
}, organId); }, organId);
// 校验正确性 // 校验正确性
validateUserForCreateOrUpdate(null, createReqVO.getMobile(), validateUserForCreateOrUpdate(null, createReqVO.getMobile(), createReqVO.getDeptId(), null, organId);
createReqVO.getEmail(), createReqVO.getDeptId(), createReqVO.getPostIds(), null, organId);
// 插入用户 // 插入用户
AdminUserDO user = BeanUtils.toBean(createReqVO, AdminUserDO.class); AdminUserDO user = BeanUtils.toBean(createReqVO, AdminUserDO.class);
// 改造：手机号直接当做用户名 // 改造：手机号直接当做用户名
@@ -184,8 +183,7 @@ public class AdminUserServiceImpl implements AdminUserService {
// 不允许关闭自身状态 // 不允许关闭自身状态
checkCurrentWhenOperateStatus(userId, updateReqVO.getStatus()); checkCurrentWhenOperateStatus(userId, updateReqVO.getStatus());
// 校验正确性 // 校验正确性
AdminUserDO currUserDO = validateUserForCreateOrUpdate(userId, mobile, AdminUserDO currUserDO = validateUserForCreateOrUpdate(userId, mobile, updateReqVO.getDeptId(), null, organId);
updateReqVO.getEmail(), updateReqVO.getDeptId(), updateReqVO.getPostIds(), null, organId);
// 更新用户 // 更新用户
AdminUserDO updateObj = BeanUtils.toBean(updateReqVO, AdminUserDO.class); AdminUserDO updateObj = BeanUtils.toBean(updateReqVO, AdminUserDO.class);
@@ -535,8 +533,7 @@ public class AdminUserServiceImpl implements AdminUserService {
return deptIds; return deptIds;
} }
private AdminUserDO validateUserForCreateOrUpdate(Long id, String username, String email, private AdminUserDO validateUserForCreateOrUpdate(Long id, String username, Long deptId, String password, Long organId) {
Long deptId, Set<Long> postIds, String password, Long organId) {
// 校验用户的密码是否符合规则 // 校验用户的密码是否符合规则
if (password != null) { if (password != null) {
validatePassword(password); validatePassword(password);
@@ -550,8 +547,6 @@ public class AdminUserServiceImpl implements AdminUserService {
// 校验部门处于开启状态 // 校验部门处于开启状态
deptService.validDept(deptId); deptService.validDept(deptId);
} }
// 校验岗位处于开启状态
postService.validatePostList(postIds);
return adminUserDO; return adminUserDO;
} }
@@ -688,8 +683,7 @@ public class AdminUserServiceImpl implements AdminUserService {
importUsers.forEach(importUser -> { importUsers.forEach(importUser -> {
// 校验，判断是否有不符合的原因 // 校验，判断是否有不符合的原因
try { try {
validateUserForCreateOrUpdate(null, null, importUser.getEmail(), validateUserForCreateOrUpdate(null, null, importUser.getDeptId(), null, organId);
importUser.getDeptId(), null, null, organId);
} catch (ServiceException ex) { } catch (ServiceException ex) {
respVO.getFailureUsernames().put(importUser.getUsername(), ex.getMessage()); respVO.getFailureUsernames().put(importUser.getUsername(), ex.getMessage());
return; return;