c-hongqw1/zhgh_cqgmy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 职工慰问 整改 优化2

Browse Source
This commit is contained in:
c-chenxs1
2026-10-09 20:59:26 +08:00
parent 5f064b076c
commit 2ebc204803
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/flow/handler/FlowRecipientUnitSchoolLeaderHandler.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class FlowRecipientUnitSchoolLeaderHandler implements AssignmentHandler {
.and(Sys_user_role::getUnitId, "=", unitId) .and(Sys_user_role::getUnitId, "=", unitId)
); );
if (Lang.isEmpty(roles)) { if (Lang.isEmpty(roles)) {
throw new BaseException("受助人所在单位未设置单位分管校领导，请联系校工会进行设置。"); throw new BaseException("受助人/申请人所在单位未设置单位分管校领导，请联系校工会进行设置。");
} }
return roles.stream().map(Sys_user_role::getUserId).distinct().toList(); return roles.stream().map(Sys_user_role::getUserId).distinct().toList();
} }
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java
+2 -2
View File
@@ -106,7 +106,7 @@ public class CondolenceReadController {
cnd.and(seg); cnd.and(seg);
} }
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name())) {
cnd.and("info.applyUnionId", "=", SecurityUtil.getUnionId()); cnd.and("info.applyUnionId", "=", SecurityUtil.getUnionId());
} }
@@ -153,7 +153,7 @@ public class CondolenceReadController {
seg.or("info.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%"); seg.or("info.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(seg); cnd.and(seg);
} }
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name())) {
cnd.and("con.applyUnionId", "=", SecurityUtil.getUnionId()); cnd.and("con.applyUnionId", "=", SecurityUtil.getUnionId());
} }
sql.setCondition(cnd); sql.setCondition(cnd);