diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java index 915f8e4d11..4dd7253eba 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java @@ -180,7 +180,7 @@ public interface ScreenCustomerAgencyDao { * @param pid * @return java.util.List */ - List selectNextAgencyList(@Param("areaCode") String areaCode, @Param("pid") String pid, @Param("allSubCustomerIds") List allSubCustomerIds); + List selectNextAgencyList(@Param("areaCode") String areaCode, @Param("pid") String pid, @Param("allCustomerIds") List allCustomerIds); /** * 查询当前组织的下面的网格,可根据areaCode查询,也可根据parentAgencyId查询 @@ -189,7 +189,7 @@ public interface ScreenCustomerAgencyDao { * @param parentAgencyId * @return java.util.List */ - List selectGridDTOList(@Param("areaCode") String areaCode, @Param("parentAgencyId") String parentAgencyId,@Param("allSubCustomerIds") List allSubCustomerIds); + List selectGridDTOList(@Param("areaCode") String areaCode, @Param("parentAgencyId") String parentAgencyId,@Param("allCustomerIds") List allCustomerIds); List selectPAgencyById(@Param("listStr")List pidList); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java index 620b67f482..251ab2f0a1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java @@ -471,6 +471,7 @@ public class ProjectServiceImpl implements ProjectService { Result> crmRes = operCrmOpenFeignClient.getAllSubCustomerIds(currentCustomerId); if (crmRes.success() && CollectionUtils.isNotEmpty(crmRes.getData())) { log.warn("❤当前客户存在子客户❤"); + crmRes.getData().add(currentCustomerId); //如果包含子客户,则根据areaCode查询下一级 agencyDTOList = screenAgencyService.queryNextAgencyList(staffResult.getData().getAreaCode(), StrConstant.EPMETY_STR,crmRes.getData()); } else { @@ -494,6 +495,7 @@ public class ProjectServiceImpl implements ProjectService { List gridList = new ArrayList<>(); if (crmRes.success() && CollectionUtils.isNotEmpty(crmRes.getData())) { //如果包含子客户,则根据areaCode查询下一级网格 + crmRes.getData().add(currentCustomerId); gridList=screenAgencyService.queryGridList(staffResult.getData().getAreaCode(), StrConstant.EPMETY_STR,crmRes.getData()); } else { //当前客户没有子客户,根据agencyId查询下一级网格 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 5a2d013d19..7852232a1c 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 @@ -355,9 +355,9 @@ AND sca.PARENT_AREA_CODE =#{areaCode} - + and sca.customer_id in - + #{customerId} @@ -377,9 +377,9 @@ AND scg.PARENT_AGENCY_ID = #{parentAgencyId} - + and scg.customer_id in - + #{customerId}