Merge remote-tracking branch 'origin/dev_statistical_optimize' into develop

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