diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index ad2c35ec1c..2ebc6b4613 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/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 staffList(StaffListFormDTO formDTO) { List resultList = new ArrayList<>(); List result = new ArrayList<>(); - //1.查询当前人员所属组织下网格列表数据,供后续封装数据使用 + //1.查询当前人员所属组织及下级所有网格列表数据,供后续封装数据使用 List list = govOrgService.gridListByStaffId(formDTO.getUserId()); if (list.size() < NumConstant.ONE) { return resultList; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index 3d00ea3cd4..92cffd9271 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/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} + ), + '%' + ) )