From d203cfea9e34ac43e885d244cbf93895bb9ba6a0 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 23 Jun 2021 16:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BD=91=E6=A0=BC=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=88org=EF=BC=8Cuser=EF=BC=8Creport=EF=BC=89=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/user/StaffPatrolDetailController.java        | 6 +++---
 .../resources/mapper/screen/ScreenCustomerAgencyDao.xml     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java
index 3778182520..8f06a5850f 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java
@@ -25,12 +25,12 @@ import java.util.List;
 @RestController
 @RequestMapping("staffpatrol")
 public class StaffPatrolDetailController {
-    
+
     @Autowired
     private StaffPatrolDetailService staffPatrolService;
 
     /**
-     * @Description  001、网格员分布
+     * @Description  001、网格员分布 优先选择areaCode查询
      * @Param formDTO
      * @author zxc
      * @date 2021/6/7 3:06 下午
@@ -77,4 +77,4 @@ public class StaffPatrolDetailController {
         return new Result<PatrolCountResultDTO>().ok(staffPatrolService.patrolCount(formDTO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 4397b99fd6..03dcd38d40 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -333,11 +333,11 @@
         LEFT JOIN epmet_evaluation_index.screen_customer_agency ca ON ca.AGENCY_ID = cg.PARENT_AGENCY_ID AND ca.DEL_FLAG = 0
         LEFT JOIN epmet_evaluation_index.screen_customer_agency ca2 ON ca2.AGENCY_ID = ca.PID AND ca2.DEL_FLAG = 0
         WHERE cg.DEL_FLAG = 0
-          <if test="agencyId == null">
+          <if test="areaCode != null and areaCode != ''">
               AND cg.AREA_CODE LIKE CONCAT(#{areaCode},'%')
           </if>
-          <if test="areaCode == null">
-              AND cg.PARENT_AGENCY_ID = #{agencyId}
+           <if test="agencyId != null and agencyId != ''">
+              AND cg.ALL_PARENT_IDS LIKE CONCAT(#{agencyId}, '%')
           </if>
     </select>
 </mapper>