From d8ad59084cf8a457a3bc84ca11ca36f3c4e78c1b Mon Sep 17 00:00:00 2001
From: = <=>
Date: Thu, 4 Dec 2025 15:06:57 +0800
Subject: [PATCH] =?UTF-8?q?bug=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/YearPlanServiceImpl.java     |  2 +-
 .../ActivitySportsResultsController.java      |  4 +--
 .../SuggestionBoxMineController.java          |  1 +
 .../assets/platform/js/mixin/flowMixins.js    | 30 +++++++++----------
 .../platform/sys/union/branchUnionManage.js   |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearPlanServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearPlanServiceImpl.java
index c7f6ea1..f671daa 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearPlanServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearPlanServiceImpl.java
@@ -59,7 +59,7 @@ public class YearPlanServiceImpl extends BaseServiceImpl<YearPlan> implements Ye
                 SELECT
                 	yp.*,
                 	ab.name as activityTypeName,
-                	year(yp.planTime) as `year`,
+                	DATE_FORMAT(yp.planTime, '%Y') as `year`,
                 	((SELECT COUNT(1) FROM activity_school acs WHERE acs.planId = yp.id) >0 ) carryOut
                 FROM
                 	year_plan yp
diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java
index 1f840c0..33fb2bb 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java
@@ -222,7 +222,7 @@ public class ActivitySportsResultsController {
                 
                 SELECT
                 	un.id,
-                	un.unionname
+                	un.name AS unionname
                 FROM
                 	activity_school_apply asa
                 	LEFT JOIN sys_union un ON un.id = asa.unionId
@@ -231,7 +231,7 @@ public class ActivitySportsResultsController {
                 	AND asa.eventId = @eventId
                 
                 GROUP BY
-                	un.unionname
+                	un.name
                 """).setParam("activityId", activityId).setParam("eventId", eventId);
         return Result.success(activitySchoolApplyViService.list(sql));
     }
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java
index 0fef845..4aa303a 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java
@@ -96,6 +96,7 @@ public class SuggestionBoxMineController {
         }
         cnd.andEX("YEAR(info.submitTime)", "=", year);
         cnd.desc("info.submitTime");
+        cnd.groupBy("info.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = suggestionBoxService.listPageMap(pageNumber, pageSize, sql);
         return Result.success(pagination);
diff --git a/src/main/resources/static/assets/platform/js/mixin/flowMixins.js b/src/main/resources/static/assets/platform/js/mixin/flowMixins.js
index b2a92fe..b661244 100644
--- a/src/main/resources/static/assets/platform/js/mixin/flowMixins.js
+++ b/src/main/resources/static/assets/platform/js/mixin/flowMixins.js
@@ -26,21 +26,21 @@ const flowMixins = {
             console.log(this.$refs.guava)
 
             // this.oepnAudit({})
-            //
-            //
-            // this.$axios.post(location.pathname + '/queryTask', {taskId}).then(res => {
-            //     if (res.code === 0) {
-            //         // 延迟1.5秒 显示loading动画 解决Guava异步加载 获取不到实例的问题
-            //         setTimeout(() => {
-            //             if (res.data.taskState === 10) {
-            //                 this.openAudit(res.data);
-            //             } else {
-            //                 this.openView(res.data);
-            //             }
-            //             loading.close();
-            //         }, 1500)
-            //     }
-            // })
+
+
+            this.$axios.post(location.pathname + '/queryTask', {taskId}).then(res => {
+                if (res.code === 0) {
+                    // 延迟1.5秒 显示loading动画 解决Guava异步加载 获取不到实例的问题
+                    setTimeout(() => {
+                        if (res.data.taskState === 10) {
+                            this.openAudit(res.data);
+                        } else {
+                            this.openView(res.data);
+                        }
+                        loading.close();
+                    }, 1500)
+                }
+            })
         },
     }
 }
diff --git a/src/main/resources/views/platform/sys/union/branchUnionManage.js b/src/main/resources/views/platform/sys/union/branchUnionManage.js
index 8df135d..3f74525 100644
--- a/src/main/resources/views/platform/sys/union/branchUnionManage.js
+++ b/src/main/resources/views/platform/sys/union/branchUnionManage.js
@@ -6,7 +6,7 @@ const branchUnionManage = {
                     <el-input placeholder="请输入分工会名称" clearable size="small" style="width: 300px" v-model="pageForm.searchKeyword"></el-input>
     
                     <el-button type="primary" class="ml5" size="small" icon="el-icon-search" @click="doSearch"></el-button>
-                    <el-button @click="openAudit" icon="el-icon-s-check" type="primary" style="margin-left: auto" size="small">基层干部审核</el-button>
+                    <el-button @click="openAudit" icon="el-icon-s-check" type="primary" style="margin-left: auto" size="small" v-if="$auth.hasPermission('sys.manager.union.add')">基层干部审核</el-button>
                     <el-button @click="openAdd" icon="ti-plus" type="primary" size="small" v-if="$auth.hasPermission('sys.manager.union.add')">新建分工会</el-button>
                 </el-row>
             </el-card>