gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【8.1.0】【userOrg】新增和编辑用户，主部门不能被禁用

pull/60/head
fengshuonan 2024-01-09 22:52:10 +08:00
parent 7f4ed7cb48
commit 0c33349d85
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/enums/SysUserOrgExceptionEnum.java
View File

@ -31,7 +31,12 @@ public enum SysUserOrgExceptionEnum implements AbstractExceptionEnum {
/**
* 用户主部门数量错误，用户存在多个主部门信息，请纠正数据错误
*/
MAIN_FLAG_COUNT_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10004", "用户主部门数量错误，用户存在多个主部门信息，请纠正数据错误，用户id为：{}");
MAIN_FLAG_COUNT_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10004", "用户主部门数量错误，用户存在多个主部门信息，请纠正数据错误，用户id为：{}"),
/**
* 用户所属主部门不能被禁用
*/
MAIN_FLAG_DISABLE_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10005", "用户所属主部门不能被禁用，请修改状态");
/**
* 错误编码

5
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
View File

@ -318,6 +318,11 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUser
throw new ServiceException(SysUserOrgExceptionEnum.EMPTY_PARAM);
}
// 主部门不能禁用
if (YesOrNotEnum.Y.getCode().equals(sysUserOrg.getMainFlag()) && !StatusEnum.ENABLE.getCode().equals(sysUserOrg.getStatusFlag())) {
throw new ServiceException(SysUserOrgExceptionEnum.MAIN_FLAG_DISABLE_ERROR);
}
// 统计主部门的数量
if (YesOrNotEnum.Y.getCode().equals(sysUserOrg.getMainFlag())) {
mainFlagCount++;