From 049de15cd8e6dd554c02277560b47d1304d6a78b Mon Sep 17 00:00:00 2001
From: = <=>
Date: Thu, 16 Oct 2025 18:26:14 +0800
Subject: [PATCH] commit

---
 .../change/MemberChangeMineController.java        |  3 ++-
 .../resources/views/platform/sys/union/index.html | 10 +++++++++-
 .../resources/views/platform/sys/unit/index.html  | 10 +++++++++-
 .../zhgh/activity/basic/settings/index.html       | 10 +++++++++-
 .../platform/zhgh/activity/basic/union/index.html | 10 +++++++++-
 .../platform/zhgh/activity/basic/unit/index.html  | 10 +++++++++-
 .../zhgh/club/infoManage/manage/index.html        | 10 +++++++++-
 .../zhgh/dayofficework/honor/basic/index.html     | 15 ++++++++++++---
 .../delegationOnePush/index.html                  |  8 ++++----
 .../delegationTwoPush/index.html                  |  8 ++++----
 .../executiveCommitteeMember/index.html           | 14 +++++++-------
 .../preparatoryGroupPush/index.html               |  8 ++++----
 .../democratic/workercongress/delegation/tree.js  | 10 +++++++++-
 .../mutualInsurance/collect/index.html            |  4 ++++
 .../staffmanage/childManage/manage/index.html     |  2 +-
 .../zhgh/staffmanage/member/change/common/info.js |  3 ++-
 16 files changed, 103 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java
index 18719775..8dbe211e 100644
--- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java
@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffmanage.member.controller.change;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
@@ -147,7 +148,7 @@ public class MemberChangeMineController {
 
     @At
     @ApiOperation("根据id查询变更记录")
-    @SaCheckPermission("member.change.mine")
+    @SaCheckPermission(value = {"member.change.mine", "member.change.unionGroup.audit"}, mode = SaMode.OR)
     public Result findMemberChangeRecord(String id){
         MemberChangeRecord record = dao.fetch(MemberChangeRecord.class, id);
         NutMap nutMap = Lang.obj2nutmap(record);
diff --git a/src/main/resources/views/platform/sys/union/index.html b/src/main/resources/views/platform/sys/union/index.html
index accf5fc4..61029c38 100644
--- a/src/main/resources/views/platform/sys/union/index.html
+++ b/src/main/resources/views/platform/sys/union/index.html
@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
                         @node-click="treeNodeClick"
                         :filter-node-method="filterNode"
                         highlight-current
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>
diff --git a/src/main/resources/views/platform/sys/unit/index.html b/src/main/resources/views/platform/sys/unit/index.html
index 22ac05fc..172ae8fd 100644
--- a/src/main/resources/views/platform/sys/unit/index.html
+++ b/src/main/resources/views/platform/sys/unit/index.html
@@ -21,7 +21,15 @@ layout("/layouts/platform.html"){
                         @node-click="treeNodeClick"
                         :filter-node-method="filterNode"
                         highlight-current
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>
diff --git a/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html b/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html
index 2edf817c..33840388 100644
--- a/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html
@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
                         highlight-current
                         node-key="id"
                         ref="treeRef"
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>
diff --git a/src/main/resources/views/platform/zhgh/activity/basic/union/index.html b/src/main/resources/views/platform/zhgh/activity/basic/union/index.html
index b66c726f..d55312cc 100644
--- a/src/main/resources/views/platform/zhgh/activity/basic/union/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/basic/union/index.html
@@ -18,7 +18,15 @@ layout("/layouts/platform.html"){
                         default-expand-all
                         highlight-current
                         ref="treeRef"
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>
diff --git a/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html b/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html
index 14737eb7..d472f6d2 100644
--- a/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html
@@ -19,7 +19,15 @@ layout("/layouts/platform.html"){
                         highlight-current
                         node-key="id"
                         ref="treeRef"
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
                 </div>
             </el-card>
         </el-col>
diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html b/src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
index d8968617..5c69ce2c 100644
--- a/src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
                                 @node-click="treeNodeClick"
                                 :filter-node-method="filterNode"
                                 highlight-current
-                            ></el-tree>
+                            >
+                                <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                                </template>
+                            </el-tree>
                         </div>
                     </el-card>
                 </el-col>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html b/src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html
index bebe6ec3..ff653da2 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html
@@ -24,7 +24,16 @@ layout("/layouts/platform.html"){
                         highlight-current
                         node-key="id"
                         ref="treeRef"
-                    ></el-tree>
+                    >
+                        <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+                    </el-tree>
+
                 </div>
             </el-card>
         </el-col>
@@ -36,8 +45,8 @@ layout("/layouts/platform.html"){
                         新建基础类型
                     </el-button>
                 </table-tool>
-                <el-table :data="tableData" :height="tableHeight" border ref="table" size="small">
-                    <el-table-column label="序号" sortable type="index"></el-table-column>
+                <el-table :data="tableData" :height="tableHeight" border ref="table" size="medium">
+                    <el-table-column label="序号" sortable type="index" width="50px"></el-table-column>
                     <el-table-column label="名称" prop="name"></el-table-column>
                     <el-table-column label="代码" prop="code"></el-table-column>
                     <el-table-column label="等级" prop="level"
diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/index.html
index 6cf41562..d1e03a21 100644
--- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/index.html
@@ -28,14 +28,14 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="代表团" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">
-                        <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
                                    v-model="pageForm.delegationId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in delegations"></el-option>
                         </el-select>
                     </search-item>
                     <search-item label="分工会">
-                        <el-select clearable filterable placeholder="分工会" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择分工会" style="width: 100%"
                                    v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unionOptions"></el-option>
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
                     <el-table-column label="姓名" prop="userName"></el-table-column>
                     <el-table-column label="年龄" prop="age"></el-table-column>
                     <el-table-column label="性别" prop="sex"></el-table-column>
-                    <el-table-column label="所属单位" prop="unitName"></el-table-column>
-                    <el-table-column label="所属工会" prop="unionName"></el-table-column>
                     <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                    <el-table-column label="所属工会" prop="unionName"></el-table-column>
+                    <el-table-column label="所属单位" prop="unitName"></el-table-column>
                     <el-table-column label="操作" width="100" fixed="right">
                         <template scope="{row}">
                             <el-button
diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html
index acd1bb32..84b925d0 100644
--- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html
@@ -28,14 +28,14 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="代表团" >
-                        <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
                                    v-model="pageForm.delegationId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in delegations"></el-option>
                         </el-select>
                     </search-item>
                     <search-item label="分工会">
-                        <el-select clearable filterable placeholder="分工会" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择分工会" style="width: 100%"
                                    v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unionOptions"></el-option>
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
                     <el-table-column label="姓名" prop="userName"></el-table-column>
                     <el-table-column label="年龄" prop="age"></el-table-column>
                     <el-table-column label="性别" prop="sex"></el-table-column>
-                    <el-table-column label="所属单位" prop="unitName"></el-table-column>
-                    <el-table-column label="所属工会" prop="unionName"></el-table-column>
                     <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                    <el-table-column label="所属工会" prop="unionName"></el-table-column>
+                    <el-table-column label="所属单位" prop="unitName"></el-table-column>
                     <el-table-column label="操作" width="100" fixed="right">
                         <template scope="{row}">
                             <el-button
diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
index cdfc35bb..8dd160d4 100644
--- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
@@ -35,22 +35,22 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </search-item>
                 <search-item label="代表团" >
-                    <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                    <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
                                v-model="pageForm.delegationId">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in delegations"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="所属工会">
-                    <el-select clearable filterable placeholder="所属工会" style="width: 100%"
+                <search-item label="分工会">
+                    <el-select clearable filterable placeholder="请选择分工会" style="width: 100%"
                                v-model="pageForm.unionId" @change="flushUnits" @clear="flushUnits">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in unionOptions"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="所属单位">
+                <search-item label="单位">
                     <el-select clearable filterable style="width: 100%"
-                               placeholder="请选择所属单位" v-model="pageForm.unitId">
+                               placeholder="请选择单位" v-model="pageForm.unitId">
                         <el-option
                                 :key="item.id"
                                 :label="item.name"
@@ -87,9 +87,9 @@ layout("/layouts/platform.html"){
                 <el-table-column label="姓名" prop="userName"></el-table-column>
                 <el-table-column label="年龄" prop="age"></el-table-column>
                 <el-table-column label="性别" prop="sex"></el-table-column>
-                <el-table-column label="所属单位" prop="unitName"></el-table-column>
+                <el-table-column label="代表团" prop="delegationName"></el-table-column>
                 <el-table-column label="所属工会" prop="unionName"></el-table-column>
-                <el-table-column label="所属代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="所属单位" prop="unitName"></el-table-column>
                 <el-table-column label="票数" prop="pushCount"></el-table-column>
                 <el-table-column label="操作" width="130" fixed="right">
                     <template scope="{row}">
diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html
index 76a0c9c1..d3c80c4e 100644
--- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html
@@ -28,14 +28,14 @@ layout("/layouts/platform.html"){
                         </el-select>
                     </search-item>
                     <search-item label="分工会">
-                        <el-select clearable filterable placeholder="分工会" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择分工会" style="width: 100%"
                                    v-model="pageForm.unionId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in unionOptions"></el-option>
                         </el-select>
                     </search-item>
                     <search-item label="代表团">
-                        <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                        <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
                                    v-model="pageForm.delegationId">
                             <el-option :key="item.id" :label="item.name" :value="item.id"
                                        v-for="item in delegations"></el-option>
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
                     <el-table-column align="center" label="姓名" prop="userName"></el-table-column>
                     <el-table-column align="center" label="年龄" prop="age"></el-table-column>
                     <el-table-column align="center" label="性别" prop="sex"></el-table-column>
-                    <el-table-column align="center" label="所属单位" prop="unitName"></el-table-column>
+                    <el-table-column align="center" label="代表团" prop="delegationName"></el-table-column>
                     <el-table-column align="center" label="所属工会" prop="unionName"></el-table-column>
-                    <el-table-column align="center" label="所属代表团" prop="delegationName"></el-table-column>
+                    <el-table-column align="center" label="所属单位" prop="unitName"></el-table-column>
                     <el-table-column align="center" label="操作" width="100" fixed="right">
                         <template scope="{row}">
                             <el-button
diff --git a/src/main/resources/views/platform/zhgh/democratic/workercongress/delegation/tree.js b/src/main/resources/views/platform/zhgh/democratic/workercongress/delegation/tree.js
index 79efa55e..b9f9e817 100644
--- a/src/main/resources/views/platform/zhgh/democratic/workercongress/delegation/tree.js
+++ b/src/main/resources/views/platform/zhgh/democratic/workercongress/delegation/tree.js
@@ -16,7 +16,15 @@ const TREE_TEMPLATE = {
                     default-expand-all
                     @node-click="treeNodeClick"
                     :filter-node-method="filterNode"
-                ></el-tree>
+                >
+                <template slot-scope="{ node, data }">
+                    <span class="el-tree-node__label">
+                        <i class="el-icon-folder-opened" v-if="node.level===1"></i>
+                        <i class="el-icon-folder" v-else></i>
+                        {{node.label}}
+                    </span>
+                        </template>
+</el-tree>
             </el-card>
         `,
     data() {
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html
index 131a56e4..a394ba1c 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html
@@ -180,6 +180,10 @@ layout("/layouts/platform.html"){
             this.$set(this.pageForm, 'year', currentYear);
             // 获取当前年份的项目列表
             this.getProjectByYear();
+            //工会查询
+            this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            //单位查询
+            this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
         }
     })
 </script>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
index 624bdda1..24f694e3 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
@@ -38,7 +38,7 @@ layout("/layouts/platform.html"){
                     </el-input>
                 </search-item>
                 <search-item label="性别">
-                    <el-select clearable placeholder="请选择性别"
+                    <el-select clearable placeholder="请选择子女性别"
                                style="width: 100%;"
                                v-model="pageForm.childrenSex">
                         <el-option label="男" value="男"></el-option>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js
index 442bc013..d258e01b 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js
@@ -50,7 +50,8 @@ const INFO = {
 					    </el-descriptions-item>
 					    <el-descriptions-item></el-descriptions-item>
 					    
-					    <template v-if="viewData.loginname == $store.state.user.loginname">
+<!--					    <template v-if="viewData.loginname == $store.state.user.loginname">-->
+					    <template>
 						    <el-descriptions-item label="家庭主要成员" :span="3">
 							    <el-table v-if="viewData.families&&viewData.families.length"
 							              :data="viewData.families" size="mini" border