From 23936ab7437da2e0535cd926c4ec5d4b28c374d0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 1 Sep 2021 14:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=86=85=E6=9C=89=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E9=A2=86=E5=AF=BC=E6=A0=87=E7=AD=BE=E7=9A=84=E4=BA=BA?=
 =?UTF-8?q?=E6=8E=92=E5=9C=A8=E5=89=8D=E9=9D=A2=EF=BC=8C=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=86=85=E6=9C=89=E7=BD=91=E6=A0=BC=E9=95=BF=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=9A=84=E4=BA=BA=E6=8E=92=E5=9C=A8=E5=89=8D=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=86=85=E6=9C=89=E9=83=A8=E9=97=A8=E9=A2=86?=
 =?UTF-8?q?=E5=AF=BC=E6=A0=87=E7=AD=BE=E7=9A=84=E4=BA=BA=E6=8E=92=E5=9C=A8?=
 =?UTF-8?q?=E5=89=8D=E9=9D=A2=EF=BC=8C=E7=9B=B8=E5=90=8C=E8=81=8C=E4=BD=8D?=
 =?UTF-8?q?=E5=8F=8A=E5=85=B6=E4=BB=96=E8=81=8C=E4=BD=8D=E6=8C=89=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E9=A1=BA=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/epmetuser/CustomerStaffDao.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
index cc2f8dab8b..07039eeed0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
@@ -60,6 +60,7 @@
             <!-- 里边的sql，尽管有去重，一个人有多个角色时，在里边sql查询出来的是一个人两条数据，is_first一个是0一个是1，所以外层需要在按人分组 -->
             SELECT DISTINCT<!-- 没有这个去重会改变最终的结果顺序，至于为什么还不清楚 -->
                 sr.staff_id,
+                cs.created_time,
                 case when gsr.role_key =
                 <choose>
                     <when test="orgType != null and orgType == 'agency' ">
@@ -74,6 +75,7 @@
                 </choose>
                 then 1 else 0 end is_first<!-- 有单位领导角色的人赋值为1，没有的赋值为0 -->
             FROM staff_role sr
+            INNER JOIN customer_staff cs ON sr.staff_id = cs.user_id
             INNER JOIN gov_staff_role gsr ON sr.role_id = gsr.id AND gsr.customer_id = #{customerId}
             WHERE
                 sr.del_flag = '0'
@@ -96,10 +98,9 @@
                         'grid_manager'
                     </otherwise>
                 </choose>
-                , sr.created_time DESC
             ) t
         GROUP BY t.staff_id
-        ORDER BY t.is_first <![CDATA[<>]]> 1, t.staff_id desc<!-- 标注有单位领导角色的人不参与排序也就是默认拍在前边 -->
+        ORDER BY t.is_first <![CDATA[<>]]> 1, t.created_time desc<!-- 标注有单位领导角色的人不参与排序也就是默认拍在前边,再按创建时间降序 -->
         LIMIT #{pageNo}, #{pageSize}
     </select>