From 8171753a5c0aedbe876cb1b127331edb7e1b5cd6 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 28 Jul 2022 17:46:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 3 +++
 .../src/main/resources/mapper/datastats/DatsStatsDao.xml       | 2 ++
 .../src/main/resources/mapper/epmetuser/StaffRoleDao.xml       | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index 8aa7467ca8..6f5682e99f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -1165,6 +1165,9 @@ public class GovOrgServiceImpl implements GovOrgService {
             formDTO.setEndDate(dateId);
         }
         CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId());
+        if (null == agencyEntity) {
+            return null;
+        }
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         long total = 0;
         if (OrgConstant.COMMUNITY.equals(agencyEntity.getLevel()) && NumConstant.ONE_STR.equals(formDTO.getType())) {
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index a473f03daf..ffee14d53f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -1253,6 +1253,8 @@
             DEL_FLAG = '0'
             AND GRID_ID = #{gridId}
             AND DATE_ID = #{dateId}
+        ORDER BY
+            CONVERT ( STAFF_NAME USING gbk )
     </select>
 
 </mapper>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml
index 9c5999aeb3..894a034659 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml
@@ -132,5 +132,7 @@
             <foreach collection="orgIds" item="id" open="AND a.ORG_ID IN (" separator="," close=")">
                     #{id}
             </foreach>
+        ORDER BY
+            CONVERT ( c.REAL_NAME USING gbk )
     </select>
 </mapper>
\ No newline at end of file