From bee5c04b95d2fad8ab3f68a10b11e8232c333482 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Thu, 11 Dec 2025 14:10:11 +0800
Subject: [PATCH] commit

---
 .../controller/TeacherCongressDelegatePushController.java  | 4 +++-
 .../democratic/teachercongress/delegate/push/index.html    | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
index 1df76313..8528c291 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.teachercongress.delegate.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
@@ -132,6 +133,7 @@ public class TeacherCongressDelegatePushController {
             }
 
         }
+        cnd.groupBy("info.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);
@@ -377,7 +379,7 @@ public class TeacherCongressDelegatePushController {
 
     @At
     @ApiOperation("本单位代表上报情况")
-    @SaCheckPermission("tc.delegate.push")
+    @SaCheckPermission(value = {"tc.delegate.push","tc.delegate.push.dwSjAudit"}, mode = SaMode.OR)
     public Result selfUnionPushMetric(String sessionId, String unionId) {
         if (StrUtil.isBlank(unionId)) {
             unionId = SecurityUtil.getUnionId();
diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
index 61a1a000..2fa69c61 100644
--- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
@@ -253,7 +253,7 @@ layout("/layouts/platform.html"){
                 writeDialog: false,
                 isRead: false,
                 userId: null,
-	            
+
 	            // 当前分工会的最大推选人员
 	            maxPush: 0,
 	            // 剩余正式代表推选名额
@@ -266,11 +266,10 @@ layout("/layouts/platform.html"){
 					this.$message.warning("当前正式代表已超过最大推选人员数，如需调整请在表格数据列中选中【删除】按钮")
 					return
 				}
-				
+
 		        this.$refs.pushFormalRef.onOpen(this.pageForm.sessionId, this.pageForm.unionId)
 	        },
 	        setMaxCount(data) {
-				debugger
 				this.maxPush = data
 	        },
             doSearch() {
@@ -335,7 +334,7 @@ layout("/layouts/platform.html"){
 	        }
         },
         created() {
-			this.pageData()
+			this.doSearch()
             this.listUnion()
             this.listSession()
         }