From 231e38f0ff22b383f5f1d1f3566137b6928cbbc1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 29 Apr 2020 15:41:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E8=BF=91=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E8=AE=BF=E9=97=AE=E7=BD=91=E6=A0=BC=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/CustomerStaffGridDao.xml | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
index b4490ab565..8ad0297daf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
@@ -18,26 +18,18 @@
 
     <!-- 查询指定客户下一个用户所在的网格，按照网格名称升序排序，取第一个 -->
     <select id="selectStaffGridOrderByGridName" parameterType="com.epmet.dto.form.LatestGridFormDTO" resultType="com.epmet.dto.CustomerGridDTO">
-        SELECT
-        grid.ID,
-        grid.GRID_NAME,
-        grid.PID
-        FROM CUSTOMER_GRID grid
-        LEFT JOIN
-        CUSTOMER_STAFF_GRID staff ON
-        (
-        grid.ID = staff.GRID_ID
-        AND
-        staff.DEL_FLAG = '0'
-        AND
-        staff.CUSTOMER_ID = #{customerId}
-        AND
-        staff.USER_ID = #{staffId}
-        )
-        WHERE
-        grid.DEL_FLAG = '0'
-        ORDER BY grid.GRID_NAME ASC
-        LIMIT 1
+        select csg.GRID_ID as id,
+        cg.GRID_NAME,
+        cg.PID
+        from customer_staff_grid csg
+        left join customer_grid cg
+        on(csg.GRID_ID=cg.id
+        and cg.DEL_FLAG='0')
+        where csg.DEL_FLAG='0'
+        and csg.CUSTOMER_ID=#{customerId}
+        and csg.USER_ID=#{staffId}
+        order by cg.GRID_NAME desc
+        limit 1
     </select>
 
     <!-- 校验用户是否已加入当前网格 -->