This commit is contained in:
2025-12-11 14:10:11 +08:00
parent 89dc6a11d1
commit bee5c04b95
2 changed files with 6 additions and 5 deletions
@@ -1,6 +1,7 @@
package com.budwk.app.zhgh.democratic.teachercongress.delegate.controller; package com.budwk.app.zhgh.democratic.teachercongress.delegate.controller;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Dict; import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
@@ -132,6 +133,7 @@ public class TeacherCongressDelegatePushController {
} }
} }
cnd.groupBy("info.id");
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination<NutMap> pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); Pagination<NutMap> pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination); return Result.success(pagination);
@@ -377,7 +379,7 @@ public class TeacherCongressDelegatePushController {
@At @At
@ApiOperation("本单位代表上报情况") @ApiOperation("本单位代表上报情况")
@SaCheckPermission("tc.delegate.push") @SaCheckPermission(value = {"tc.delegate.push","tc.delegate.push.dwSjAudit"}, mode = SaMode.OR)
public Result selfUnionPushMetric(String sessionId, String unionId) { public Result selfUnionPushMetric(String sessionId, String unionId) {
if (StrUtil.isBlank(unionId)) { if (StrUtil.isBlank(unionId)) {
unionId = SecurityUtil.getUnionId(); unionId = SecurityUtil.getUnionId();
@@ -270,7 +270,6 @@ layout("/layouts/platform.html"){
this.$refs.pushFormalRef.onOpen(this.pageForm.sessionId, this.pageForm.unionId) this.$refs.pushFormalRef.onOpen(this.pageForm.sessionId, this.pageForm.unionId)
}, },
setMaxCount(data) { setMaxCount(data) {
debugger
this.maxPush = data this.maxPush = data
}, },
doSearch() { doSearch() {
@@ -335,7 +334,7 @@ layout("/layouts/platform.html"){
} }
}, },
created() { created() {
this.pageData() this.doSearch()
this.listUnion() this.listUnion()
this.listSession() this.listSession()
} }