From d387d96b0b4fdcff1b551764d9408c623d4031b4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 29 Jul 2021 11:17:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8BUI?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/PendingResultDTO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java index d469915f90..7fe06f2dce 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java @@ -25,7 +25,6 @@ public class PendingResultDTO implements Serializable { private List currentHandleDepartMent; private List topicVoices; private List topicImgs; - @JsonIgnore private String sourceId; @JsonIgnore private String projectId; From 13335b286da549b5a24605d74b823ff111ffa801 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 29 Jul 2021 14:05:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/user/UserDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml index a4a31ca6b2..c465d7cc41 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml @@ -813,7 +813,7 @@ LEFT JOIN register_relation rr ON (rr.USER_ID = urole.USER_ID) LEFT JOIN ( SELECT - count(urole.USER_ID) AS userCount, + count(distinct urole.USER_ID) AS userCount, rr.GRID_ID FROM USER_ROLE urole LEFT JOIN EPMET_ROLE erole ON (urole.ROLE_ID = erole.ID AND erole.DEL_FLAG = '0') @@ -833,7 +833,7 @@ ) t ON (t.GRID_ID = rr.GRID_ID) LEFT JOIN ( SELECT - count(urole.USER_ID) AS userCount, + count(distinct urole.USER_ID) AS userCount, rr.GRID_ID FROM USER_ROLE urole LEFT JOIN EPMET_ROLE erole ON (urole.ROLE_ID = erole.ID AND erole.DEL_FLAG = '0')