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

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
+        select csg.GRID_ID as id,
-        grid.ID,
+        cg.GRID_NAME,
-        grid.GRID_NAME,
+        cg.PID
-        grid.PID
+        from customer_staff_grid csg
-        FROM CUSTOMER_GRID grid
+        left join customer_grid cg
-        LEFT JOIN
+        on(csg.GRID_ID=cg.id
-        CUSTOMER_STAFF_GRID staff ON
+        and cg.DEL_FLAG='0')
-        (
+        where csg.DEL_FLAG='0'
-        grid.ID = staff.GRID_ID
+        and csg.CUSTOMER_ID=#{customerId}
-        AND
+        and csg.USER_ID=#{staffId}
-        staff.DEL_FLAG = '0'
+        order by cg.GRID_NAME desc
-        AND
+        limit 1
-        staff.CUSTOMER_ID = #{customerId}
-        AND
-        staff.USER_ID = #{staffId}
-        )
-        WHERE
-        grid.DEL_FLAG = '0'
-        ORDER BY grid.GRID_NAME ASC
-        LIMIT 1
     </select>
 
     <!-- 校验用户是否已加入当前网格 -->