mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
1、新增部门校验问题修复;2、自定义板编号跨单导入问题修复;
This commit is contained in:
+1
-1
@@ -247,7 +247,7 @@ public class CustomPlateNoServiceHandler extends AbstractSystemConfigServiceHand
|
||||
// 查询机构下的现有自定义板编号配置最大版本号
|
||||
Integer maxCustomPlateNoSystemConfigVersion = systemConfigMapper.selectOrgMaxCustomPlateNoSystemConfigVersion(OrganContextHolder.getOrganId());
|
||||
// 版本号 + 1
|
||||
reqVO.setVersion(maxCustomPlateNoSystemConfigVersion + 1);
|
||||
reqVO.setVersion((ObjectUtil.isNotNull(maxCustomPlateNoSystemConfigVersion) ? maxCustomPlateNoSystemConfigVersion : 0) + 1);
|
||||
// 自定义板编号每次保存都创建新版本
|
||||
reqVO.setId(null);
|
||||
}
|
||||
|
||||
+5
-2
@@ -534,8 +534,11 @@ public class AdminUserServiceImpl implements AdminUserService {
|
||||
AdminUserDO adminUserDO = validateUserExists(id);
|
||||
// 校验用户名唯一
|
||||
validateUsernameUnique(id, username, organId);
|
||||
// 校验部门处于开启状态
|
||||
deptService.validDept(deptId);
|
||||
// 组织管理员不归属部门
|
||||
if (ObjectUtil.isNotNull(deptId)) {
|
||||
// 校验部门处于开启状态
|
||||
deptService.validDept(deptId);
|
||||
}
|
||||
// 校验岗位处于开启状态
|
||||
postService.validatePostList(postIds);
|
||||
return adminUserDO;
|
||||
|
||||
Reference in New Issue
Block a user