diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java index 600c32e8..7b27f06c 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java @@ -60,11 +60,12 @@ public class ExecutiveCommitteeConfigController { sun.name as unionName, sun.unionCode , (SELECT count( 1 ) FROM vw_user where sun.id = unionId) as memberCount, + (SELECT count( 1 ) FROM teacher_congress_delegate where unionId =sun.id and sessionId=@sessionId) as dbCount, 0 as quotaCount FROM sys_union sun ORDER BY unionCode ASC - """); + """).setParam("sessionId",sessionId); List listMap = committeeConfigService.listMap(sql); config.setUnionQuotaList(listMap); } 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 2541c0b5..236c9b6c 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 @@ -124,8 +124,13 @@ public class TeacherCongressDelegatePushController { cnd.and(group); } cnd.desc("info.createdAt"); - if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { - cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + if (AuthUtil.hasRole(RoleConstant.UNIT_PARTY_SECRETARY.name())){ + cnd.andEX("info.unionId", "=", SecurityUtil.getUnionId()); + }else{ + cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); + } + } sql.setCondition(cnd); Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html index e5045d52..6f7e1c3c 100644 --- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html @@ -114,7 +114,7 @@ layout("/layouts/platform.html"){ }, tableColumns: [ {prop: 'unionName', label: '分工会名称', sortable: true}, - {prop: 'memberCount', label: '代表人数', sortable: true}, + {prop: 'dbCount', label: '代表人数', sortable: true}, {prop: 'quotaCount', label: '分配人数', sortable: true} ], formData: {},