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