From 180544e22a6bb996eb83e3cfe047da3952fe7221 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Thu, 18 Dec 2025 12:38:42 +0800
Subject: [PATCH] commit

---
 .../ActivityDeclareSchoolUnionController.java | 10 ++-
 .../controller/BlessingUserController.java    |  2 +-
 .../declare/apply/index.html                  |  2 +-
 .../staffbenefit/blessing/blessingUser.html   | 82 ++++++++-----------
 4 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java
index 8d04806..a33b7f6 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java
@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -94,8 +95,6 @@ public class ActivityDeclareSchoolUnionController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        pageParam.buildSearch(cnd, "info.");
-
         cnd.and("t.taskName", "=", "81428a9b-63c0-44b8-a28c-17d282c2cc8e");
         cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
 
@@ -105,6 +104,13 @@ public class ActivityDeclareSchoolUnionController {
             cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
         }
 
+        if (StrUtil.isNotBlank(pageParam.getSearchKeyword())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("info.userName", pageParam.getSearchKeyword());
+            seg.orLike("info.loginName", pageParam.getSearchKeyword());
+            cnd.and(seg);
+        }
+
         if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) {
             cnd.desc("info.applyTime");
         } else {
diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java
index e625d85..2d08146 100644
--- a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java
@@ -48,7 +48,7 @@ public class BlessingUserController {
                 FROM
                 	blessing_user blu
                 	LEFT JOIN blessing bl ON bl.id = blu.blessingId
-                	LEFT JOIN `user` u ON u.id = blu.userId
+                	LEFT JOIN `vw_user` u ON u.id = blu.userId
                 $condition
                 """);
         if (Strings.isNotBlank(pageForm.getSearchKeyword()) && Strings.isNotBlank(pageForm.getSearchName())) {
diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
index fd92510..d75ff41 100644
--- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
@@ -356,7 +356,7 @@ layout("/layouts/platform.html"){
                             }
                         })
                     }
-                    if (this.$auth.hasRoleOr(["BRANCH_UNION_WENTI_SPORTS", "UNION_REIMBURSEMENT_MANAGER"])) {
+                    if (this.$auth.hasRoleOr(["BRANCH_UNION_WENTI_SPORTS", "BRANCH_UNION_CHAIRMAN"])) {
                         this.activityDeclareReimbursementList.map(v => {
                             if (["BRANCH_UNION"].includes(v.name)) {
                                 activityDeclareReimbursementList.push(v)
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html
index 67f2419..8b48037 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html
@@ -46,14 +46,13 @@ layout("/layouts/platform.html"){
                         </div>
                     </div>
 
-                    <div class="search-item"
-                         v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}">
+                    <div class="search-item">
                         <div class="search-item-label">所属工会：</div>
                         <div class="search-item-option">
                             <el-select placeholder="所属工会" v-model="pageForm.unionId" style="width: 100%;"
-                                       clearable="true"
+                                       clearable
                                        @change="flushUnits" @clear="flushUnits"
-                                       filterable="true">
+                                       filterable>
                                 <el-option v-for="item in unions" :label="item.unionname" :value="item.id"></el-option>
                             </el-select>
                         </div>
@@ -63,8 +62,8 @@ layout("/layouts/platform.html"){
                         <div class="search-item-label">所属单位：</div>
                         <div class="search-item-option">
                             <el-select placeholder="所属单位" v-model="pageForm.unitId" style="width: 100%;"
-                                       clearable="true"
-                                       filterable="true">
+                                       clearable
+                                       filterable>
                                 <el-option v-for="item in units" :label="item.name" :value="item.id"></el-option>
                             </el-select>
                         </div>
@@ -83,49 +82,41 @@ layout("/layouts/platform.html"){
                         </div>
                     </div>
 
-                    <template v-if="searchMore">
-                        <div class="search-item">
-                            <div class="search-item-label">人员类型：</div>
-                            <div class="search-item-option">
-                                <dict-select v-model="pageForm.personType" style="width: 100%" clearable
-                                             placeholder="人员类型"
-                                             code="UserType"></dict-select>
-                            </div>
+                    <div class="search-item">
+                        <div class="search-item-label">人员类型：</div>
+                        <div class="search-item-option">
+                            <dict-select v-model="pageForm.personType" style="width: 100%" clearable
+                                         placeholder="人员类型"
+                                         code="UserType"></dict-select>
                         </div>
+                    </div>
 
-                        <div class="search-item">
-                            <div class="search-item-label">在职状态：</div>
-                            <div class="search-item-option">
-                                <dict-select v-model="pageForm.userState" style="width: 100%" clearable
-                                             placeholder="在职状态"
-                                             code="UserState"></dict-select>
-                            </div>
+                    <div class="search-item">
+                        <div class="search-item-label">在职状态：</div>
+                        <div class="search-item-option">
+                            <dict-select v-model="pageForm.userState" style="width: 100%" clearable
+                                         placeholder="在职状态"
+                                         code="UserState"></dict-select>
                         </div>
+                    </div>
 
-                        <div class="search-item">
-                            <div class="search-item-label">性&emsp;&emsp;别：</div>
-                            <div class="search-item-option">
-                                <el-select v-model="pageForm.sex" style="width: 100%" clearable
-                                           placeholder="请选择">
-                                    <el-option v-for="sex in sexOptions" :label="sex" :value="sex"></el-option>
-                                </el-select>
-                            </div>
+                    <div class="search-item">
+                        <div class="search-item-label">性&emsp;&emsp;别：</div>
+                        <div class="search-item-option">
+                            <el-select v-model="pageForm.sex" style="width: 100%" clearable
+                                       placeholder="请选择">
+                                <el-option v-for="sex in sexOptions" :label="sex" :value="sex"></el-option>
+                            </el-select>
                         </div>
-                    </template>
+                    </div>
                     <div class="search-query">
                         <el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
-
-                        <more v-model="searchMore"></more>
                     </div>
                 </div>
             </el-card>
             <el-card shadow="never" class="mt20">
-
-
                 <table-tool label="用户列表" :app="this">
-                    <template #func>
 
-                    </template>
                 </table-tool>
 
                 <el-table :data="tableData" style="width: 100%" row-key="id" @sort-change="pageOrder"
@@ -134,7 +125,6 @@ layout("/layouts/platform.html"){
 
                     <el-table-column align="center" header-align="center" type="index" :index="indexMethod" label="序号"
                                      width="80px"></el-table-column>
-
                     <el-table-column
                             align="center"
                             header-align="center"
@@ -147,13 +137,9 @@ layout("/layouts/platform.html"){
                     </el-table-column>
                 </el-table>
                 <!--#include("/layouts/pagination.html"){}#-->
-
             </el-card>
         </template>
-
     </guava>
-
-
 </div>
 <script>
     const vue = new Vue({
@@ -192,26 +178,24 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
-
-
             async getActivityGroup() {
                 const {data} = await $.get('/platform/activity/basic/scope/getActivityUserScopeGroup')
                 this.activityGroupList = data
             },
             async flushUnits() {
-                this.$set(this.pageForm, "unitId", "")
-                if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'true') {
-                    this.units = await getUnits(this.pageForm.unionId)
+                this.$set(this.pageForm, "unitId", null)
+                if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
+                    this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
                 } else {
-                    this.units = await getUnits("${@shiro.getPrincipalProperty('unit').getUnionid()}")
+                    this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
                 }
-            }
+            },
 
         },
         async created() {
             await this.getActivityGroup()
             this.pageData()
-            this.unions = await getUnions()
+            this.unions = await this.$businessTool.listUnion()
             this.flushUnits()
         }
     })