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 @@ SELECT DISTINCT sr.staff_id, + cs.created_time, case when gsr.role_key = @@ -74,6 +75,7 @@ then 1 else 0 end is_first 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' - , sr.created_time DESC ) t GROUP BY t.staff_id - ORDER BY t.is_first ]]> 1, t.staff_id desc + ORDER BY t.is_first ]]> 1, t.created_time desc LIMIT #{pageNo}, #{pageSize}