From 392b75c355cf3b80cc762be15a341a726bcd7471 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 23 Jun 2021 10:51:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=A4=9A-=E5=B7=A1=E6=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E5=8F=AF=E6=9F=A5=E7=9C=8B=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=BB=84=E7=BB=87=E5=8F=8A=E4=B8=8B=E7=BA=A7=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=BD=91=E6=A0=BC=E5=88=97=E8=A1=A8=E4=B8=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmetuser/impl/EpmetUserServiceImpl.java | 2 +- .../mapper/govorg/CustomerGridDao.xml | 23 +++++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) 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} + ), + '%' + ) )