diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java
index 986350e424..4b825e3da4 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java
@@ -20,6 +20,11 @@ public class GridManagerListResultDTO implements Serializable {
      */
     private String staffId;
 
+    /**
+     * 工作人员手机号
+     */
+    private String mobile;
+
     /**
      * 经度
      */
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>
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java
index d74af6d7f6..8cda9d5f32 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java
@@ -18,4 +18,6 @@ public class GridStaffResultDTO implements Serializable {
 
     private String staffId;
 
+    private String mobile;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
index 1054b26a5e..98328339b5 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
@@ -199,9 +199,11 @@
         <foreach collection="forms" item="s" separator=" UNION ALL ">
             SELECT
             #{s.gridId} as gridId,
-            sr.STAFF_ID
+            sr.STAFF_ID,
+            cs.MOBILE
             FROM staff_role sr
             LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID AND gsr.DEL_FLAG = 0
+            LEFT JOIN  customer_staff cs ON cs.USER_ID = sr.STAFF_ID AND cs.customer_id = sr.customer_id AND cs.DEL_FLAG = 0
             WHERE sr.DEL_FLAG = 0
             AND gsr.ROLE_KEY = 'grid_member'
             AND sr.STAFF_ID = #{s.staffId}