commit

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();