Merge remote-tracking branch 'origin/dev_bugfix' into dev

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml

@@ -18,18 +18,24 @@
 
     <!-- 查询指定客户下一个用户所在的网格，按照网格名称升序排序，取第一个 -->
     <select id="selectStaffGridOrderByGridName" parameterType="com.epmet.dto.form.LatestGridFormDTO" resultType="com.epmet.dto.CustomerGridDTO">
-        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
+            grid.ID,
+            grid.GRID_NAME,
+            grid.PID
+		FROM CUSTOMER_STAFF_GRID staff
+        LEFT JOIN
+            CUSTOMER_GRID grid ON
+            grid.ID = staff.GRID_ID
+        WHERE
+            grid.DEL_FLAG = '0'
+		AND
+            staff.DEL_FLAG = '0'
+        AND
+            staff.CUSTOMER_ID = #{customerId}
+        AND
+            staff.USER_ID = #{staffId}
+        ORDER BY grid.GRID_NAME ASC
+        LIMIT 1
     </select>
 
     <!-- 校验用户是否已加入当前网格 -->