From 2ebc204803d30d07df49759b231a77391ba66725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Fri, 9 Oct 2026 20:59:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=81=8C=E5=B7=A5=E6=85=B0=E9=97=AE=20?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/handler/FlowRecipientUnitSchoolLeaderHandler.java | 2 +- .../condolence/controller/CondolenceReadController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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);