更多-巡查记录列表可查看当前组织及下级所有网格列表下数据

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -84,7 +84,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     public List<StaffListResultDTO> staffList(StaffListFormDTO formDTO) {
         List<StaffListResultDTO> resultList = new ArrayList<>();
         List<StaffListResultDTO> result = new ArrayList<>();
-        //1.查询当前人员所属组织下网格列表数据，供后续封装数据使用
+        //1.查询当前人员所属组织及下级所有网格列表数据，供后续封装数据使用
         List<CustomerGridDTO> list = govOrgService.gridListByStaffId(formDTO.getUserId());
         if (list.size() < NumConstant.ONE) {
             return resultList;

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml

@@ -78,11 +78,24 @@
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'
-        AND cg.pid = (
-            select agency_id
-            from customer_staff_agency
-            where del_flag = '0'
-            AND user_id = #{staffId}
+        AND (
+            cg.pid = (
+                select agency_id
+                from customer_staff_agency
+                where del_flag = '0'
+                AND user_id = #{staffId}
+            )
+            OR
+            cg.pids LIKE CONCAT(
+                '%',
+                (
+                    select agency_id
+                    from customer_staff_agency
+                    where del_flag = '0'
+                    AND user_id = #{staffId}
+                ),
+                '%'
+            )
         )
     </select>