南京理工-分级核对:工会组织管理页面仅给‘机关党委工会’的成员单位列表,三级单位管理员设置按钮不显示问题修复;
This commit is contained in:
@@ -50,6 +50,7 @@ public class LevelCheckService {
|
||||
"薪酬单位代码", "职工号", "姓名", "扣工会会费", "年月", "所在单位"
|
||||
);
|
||||
private static final String UNIT_HEADER = "所在单位";
|
||||
private static final String THIRD_UNIT_MANAGER_UNION_CODE = "28";
|
||||
private static final ZoneId TASK_ZONE_ID = ZoneId.of("Asia/Shanghai");
|
||||
|
||||
@Inject
|
||||
@@ -745,11 +746,12 @@ public class LevelCheckService {
|
||||
String unionId = Strings.trim(config.getConfigValue());
|
||||
Sys_union configuredUnion = dao.fetch(Sys_union.class, unionId);
|
||||
if (configuredUnion != null
|
||||
&& "机关党委工会".equals(Strings.trim(configuredUnion.getUnionname()))) {
|
||||
&& THIRD_UNIT_MANAGER_UNION_CODE.equals(Strings.trim(configuredUnion.getUnioncode()))) {
|
||||
return unionId;
|
||||
}
|
||||
}
|
||||
Sys_union union = dao.fetch(Sys_union.class, Cnd.where("unionname", "=", "机关党委工会"));
|
||||
Sys_union union = dao.fetch(Sys_union.class,
|
||||
Cnd.where("unioncode", "=", THIRD_UNIT_MANAGER_UNION_CODE));
|
||||
return union == null ? "" : union.getId();
|
||||
}
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ import java.util.stream.Collectors;
|
||||
@Ok("json")
|
||||
public class SysUnionMangeCon {
|
||||
private static final Log log = Logs.get();
|
||||
private static final String THIRD_UNIT_MANAGER_UNION_CODE = "28";
|
||||
|
||||
@Inject
|
||||
private SysUnionService sysUnionService;
|
||||
@@ -452,7 +453,7 @@ public class SysUnionMangeCon {
|
||||
throw new SecurityException("仅校工会管理员可设置三级管理员");
|
||||
}
|
||||
Sys_union union = sysUnionService.fetch(unionId);
|
||||
if (union == null || !"机关党委工会".equals(Strings.trim(union.getUnionname()))) {
|
||||
if (union == null || !THIRD_UNIT_MANAGER_UNION_CODE.equals(Strings.trim(union.getUnioncode()))) {
|
||||
throw new IllegalArgumentException("仅机关党委工会的成员单位可设置三级管理员");
|
||||
}
|
||||
Sys_unit unit = sysUnitService.fetch(unitId);
|
||||
|
||||
Reference in New Issue
Block a user