From 853131297e2286d27ec4cc4ef7805a62c4fd0b9b Mon Sep 17 00:00:00 2001 From: hongqiwei <1143662660@qq.com> Date: Wed, 2 Sep 2026 16:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=85=B0=E9=97=AE=E5=AF=B9=E8=B1=A1=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E6=98=AF=E4=BC=9A=E5=91=98=E8=BA=AB=E4=BB=BD=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E5=B7=A5=E4=BC=9A=E5=A7=94=E5=91=98=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=9C=AC=E5=B7=A5=E4=BC=9A=E7=9A=84=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exerciseCard/controller/ExerciseCardApplyController.java | 2 ++ .../controller/UnionReimburseApplyController.java | 2 ++ .../condolence/controller/CondolenceApplyController.java | 5 ++++- .../controller/DifficultHelpApplyController.java | 2 ++ .../controller/MutualInsuranceApplyController.java | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardApplyController.java index 0340018..ba7ad43 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardApplyController.java @@ -93,6 +93,8 @@ public class ExerciseCardApplyController { $condition """); Cnd cnd = Cnd.NEW(); + // 健身卡信息填报对象必须是工会会员，会员标识为 1。 + cnd.and("member", "=", 1); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) { diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java index 67a9c77..227beaf 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java @@ -165,6 +165,8 @@ public class UnionReimburseApplyController { $condition """); Cnd cnd = Cnd.NEW(); + // 慰问报销对象必须是工会会员，会员标识为 1。 + cnd.and("member", "=", 1); if (StrUtil.isNotBlank(keyword)) { SqlExpressionGroup seg = new SqlExpressionGroup(); seg.or(View_user::getLoginname, "like", "%" + keyword + "%"); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java index f43681a..db85772 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java @@ -138,6 +138,8 @@ public class CondolenceApplyController { $condition """); Cnd cnd = Cnd.NEW(); + // 慰问对象必须是工会会员，会员标识为 1，未入会或会员状态为空的人员不纳入选择范围。 + cnd.and(View_user::getMember, "=", 1); if (StrUtil.isNotBlank(keyword)) { SqlExpressionGroup seg = new SqlExpressionGroup(); seg.or(View_user::getLoginname, "like", "%" + keyword + "%"); @@ -145,7 +147,8 @@ public class CondolenceApplyController { cnd.and(seg); } if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - if(AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { + // 分工会管理员、主席和委员只能为当前所属分工会人员发起慰问申请。 + if(AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_WY.name())) { cnd.and(View_user::getUnionId, "=", SecurityUtil.getUnionId()); } else { cnd.and(View_user::getId, "=", SecurityUtil.getUserId()); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java index 26636ef..ecf4666 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java @@ -149,6 +149,8 @@ public class DifficultHelpApplyController { $condition """); Cnd cnd = Cnd.NEW(); + // 困难帮扶受助人必须是工会会员，会员标识为 1。 + cnd.and("member", "=", 1); cnd.and("id", "<>", SecurityUtil.getUserId()); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) { diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceApplyController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceApplyController.java index 2efa423..d2b9df1 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceApplyController.java @@ -144,6 +144,8 @@ public class MutualInsuranceApplyController { $condition """); Cnd cnd = Cnd.NEW(); + // 互助保障受助人必须是工会会员，会员标识为 1。 + cnd.and("member", "=", 1); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) {