diff --git a/src/main/java/com/budwk/app/flow/handler/FlowRecipientUnitSchoolLeaderHandler.java b/src/main/java/com/budwk/app/flow/handler/FlowRecipientUnitSchoolLeaderHandler.java index e02b433..4dab4bd 100644 --- a/src/main/java/com/budwk/app/flow/handler/FlowRecipientUnitSchoolLeaderHandler.java +++ b/src/main/java/com/budwk/app/flow/handler/FlowRecipientUnitSchoolLeaderHandler.java @@ -55,7 +55,7 @@ public class FlowRecipientUnitSchoolLeaderHandler implements AssignmentHandler { .and(Sys_user_role::getUnitId, "=", unitId) ); if (Lang.isEmpty(roles)) { - throw new BaseException("受助人所在单位未设置单位分管校领导,请联系校工会进行设置。"); + throw new BaseException("受助人/申请人所在单位未设置单位分管校领导,请联系校工会进行设置。"); } return roles.stream().map(Sys_user_role::getUserId).distinct().toList(); } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java index 8c75efe..03c0f88 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java @@ -106,7 +106,7 @@ public class CondolenceReadController { 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()); } @@ -153,7 +153,7 @@ public class CondolenceReadController { seg.or("info.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%"); 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()); } sql.setCondition(cnd);