From 0ece1d128769b993ca991437a88d01511c8f25d9 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 29 Apr 2020 15:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E6=AC=A1=E7=99=BB=E9=99=86=E7=9A=84=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=EF=BC=8Csql=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/CustomerStaffGridDao.xml | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 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..9a4290d11c 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
@@ -19,23 +19,21 @@
     <!-- 查询指定客户下一个用户所在的网格，按照网格名称升序排序，取第一个 -->
     <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
+            grid.ID,
+            grid.GRID_NAME,
+            grid.PID
+		FROM CUSTOMER_STAFF_GRID staff
         LEFT JOIN
-        CUSTOMER_STAFF_GRID staff ON
-        (
-        grid.ID = staff.GRID_ID
-        AND
-        staff.DEL_FLAG = '0'
+            CUSTOMER_GRID grid ON
+            grid.ID = staff.GRID_ID
+        WHERE
+            grid.DEL_FLAG = '0'
+		AND
+            staff.DEL_FLAG = '0'
         AND
-        staff.CUSTOMER_ID = #{customerId}
+            staff.CUSTOMER_ID = #{customerId}
         AND
-        staff.USER_ID = #{staffId}
-        )
-        WHERE
-        grid.DEL_FLAG = '0'
+            staff.USER_ID = #{staffId}
         ORDER BY grid.GRID_NAME ASC
         LIMIT 1
     </select>