From 276fbae2ed3802472898d85aa26dcd793f46e5a5 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Thu, 18 Dec 2025 10:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/budwk/app/base/constant/RoleConstant.java | 1 +
 .../zhgh/welfare/service/impl/WelfareListServiceImpl.java   | 2 +-
 .../service/impl/WelfareSelectionSituationServiceImpl.java  | 6 +++---
 .../welfare/service/impl/WelfareStatisticsServiceImpl.java  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/budwk/app/base/constant/RoleConstant.java b/src/main/java/com/budwk/app/base/constant/RoleConstant.java
index a93eec8..3f28ab7 100644
--- a/src/main/java/com/budwk/app/base/constant/RoleConstant.java
+++ b/src/main/java/com/budwk/app/base/constant/RoleConstant.java
@@ -46,6 +46,7 @@ RoleConstant {
     BRANCH_UNION_WENTI_WY("分工会文体委员"),
     BRANCH_UNION_SHENGGHUO_WY("分工会生活委员"),
     BRANCH_UNION_TIAOJIE_WY("分工会调解委员"),
+    BRANCH_UNION_WENTI_SPORTS("分工会文体福利委员"),
 
 	UNIT_PARTY_SECRETARY("单位党委书记"),
 
diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java
index 4eb3737..6bbce8a 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java
@@ -409,7 +409,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
         if (pageForm.getBirthMonths() != null && pageForm.getBirthMonths().length > 0) {
             cnd.andEX("MONTH(t2.birthday)", "in", pageForm.getBirthMonths());
         }
-        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_WENTI_SPORTS.name())) {
             cnd.and("t2.unionId", "=", SecurityUtil.getUnionId());
         }
         cnd.andEX("t1.welfareUnitId", "in", pageForm.getUnitIds());
diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java
index 3856182..d1a4d94 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java
@@ -77,7 +77,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                 """);
         Cnd cnd = Cnd.NEW();
 
-        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_OPERATOR.name())) {
+        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_WENTI_SPORTS.name())) {
             cnd.and("t1.welfareUnionId", "=", SecurityUtil.getUnionId());
         }
 
@@ -136,7 +136,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                 """);
         Cnd cnd = Cnd.NEW();
 
-        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_OPERATOR.name())) {
+        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_WENTI_SPORTS.name())) {
             cnd.and("t1.welfareUnionId", "=", SecurityUtil.getUnionId());
         }
 
@@ -221,7 +221,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
         Cnd cnd = Cnd.NEW();
         cnd.and("t1.projectId", "=", pageForm.getProjectId());
         cnd.groupBy("t1.id");
-        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name())) {
+        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name())|| AuthUtil.hasRole(RoleConstant.BRANCH_UNION_WENTI_SPORTS.name())) {
             cnd.and("t1.welfareUnionId", "=", SecurityUtil.getUnionId());
         }
         cnd.asc("t1.welfareUnitId");
diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
index a5aa0a1..1dbf562 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
@@ -48,7 +48,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
     public NutMap pageData(String projectId, String unionId) {
         // 分工会数据
         List<Sys_union> unions;
-        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name())) {
+        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name())|| AuthUtil.hasRole(RoleConstant.BRANCH_UNION_WENTI_SPORTS.name())) {
              unions = dao().query(Sys_union.class, Cnd.NEW().andEX(Sys_union::getId, "=", SecurityUtil.getUnionId()).asc(Sys_union::getUnionCode));
         }else {
              unions = dao().query(Sys_union.class, Cnd.NEW().andEX(Sys_union::getId, "=", unionId).asc(Sys_union::getUnionCode));