From 55a97b0398f9ebcc96c6a03c3febc273fdb861a3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 30 Apr 2020 14:20:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=BF=E9=97=AE=E7=BD=91=E6=A0=BC=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8-=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/CustomerGridDao.xml | 25 +++++++++++++------
 .../main/resources/mapper/GridLatestDao.xml   |  1 +
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 210d0a1f55..0d8cd89636 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -265,16 +265,27 @@
 
     <select id="selectGridByIds" resultType="com.epmet.dto.result.AllGridsByUserIdResultDTO">
         SELECT
-            id AS 'gridId',
-            grid_name AS 'gridName',
-            customer_id AS 'customerId'
-        FROM customer_grid
-        WHERE del_flag = '0'
-        AND id IN
+            cg.id AS 'gridId',
+            IF(
+                ca.ORGANIZATION_NAME = '',
+                cg.grid_name,
+                CONCAT(ca.organization_name,'-',cg.grid_name)
+            ) AS 'gridName',
+            cg.customer_id AS 'customerId'
+        FROM customer_grid cg
+        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        WHERE cg.del_flag = '0'
+        AND ca.del_flag = '0'
+        AND cg.id IN
         <foreach item="id" collection="gridIdList" open="(" separator="," close=")">
             #{id}
         </foreach>
-        ORDER BY CONVERT (grid_name USING gbk) ASC<!-- 网格名称对应拼音升序排序 -->
+        ORDER BY field(
+            cg.id,
+            <foreach item="id" collection="gridIdList" separator=",">
+                #{id}
+            </foreach>
+        )<!-- 按照foreach中遍历的Id顺序排序(按网格访问时间倒序) -->
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
index b274779697..3dfe0f9939 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
@@ -80,5 +80,6 @@
         WHERE
             del_flag = '0'
         AND customer_user_id = #{userId}
+        ORDER BY latest_time DESC
     </select>
 </mapper>