From 24f59a001ae1403060349056633cdc47fe0eaf35 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 30 Jun 2021 15:18:26 +0800
Subject: [PATCH] =?UTF-8?q?project/mynextagency-multic=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/screen/ScreenCustomerAgencyDao.java   | 4 ++--
 .../service/project/impl/ProjectServiceImpl.java          | 2 ++
 .../resources/mapper/screen/ScreenCustomerAgencyDao.xml   | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

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<com.epmet.dto.result.ScreenCustomerAgencyDTO>
      */
-    List<ScreenCustomerAgencyDTO> selectNextAgencyList(@Param("areaCode") String areaCode, @Param("pid") String pid, @Param("allSubCustomerIds") List<String> allSubCustomerIds);
+    List<ScreenCustomerAgencyDTO> selectNextAgencyList(@Param("areaCode") String areaCode, @Param("pid") String pid, @Param("allCustomerIds") List<String> allCustomerIds);
 
     /**
      * 查询当前组织的下面的网格，可根据areaCode查询，也可根据parentAgencyId查询
@@ -189,7 +189,7 @@ public interface ScreenCustomerAgencyDao {
      * @param parentAgencyId
      * @return java.util.List<com.epmet.dto.result.ScreenCustomerAgencyDTO>
      */
-    List<ScreenCustomerGridDTO> selectGridDTOList(@Param("areaCode") String areaCode, @Param("parentAgencyId") String parentAgencyId,@Param("allSubCustomerIds") List<String> allSubCustomerIds);
+    List<ScreenCustomerGridDTO> selectGridDTOList(@Param("areaCode") String areaCode, @Param("parentAgencyId") String parentAgencyId,@Param("allCustomerIds") List<String> allCustomerIds);
 
     List<ParentListResultDTO> selectPAgencyById(@Param("listStr")List<String> 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<List<String>> 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<ScreenCustomerGridDTO> 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 @@
             <if test="areaCode != null and areaCode != ''">
                 AND sca.PARENT_AREA_CODE =#{areaCode}
             </if>
-            <if test="allSubCustomerIds != null and allSubCustomerIds.size() > 0">
+            <if test="allCustomerIds != null and allCustomerIds.size() > 0">
                 and sca.customer_id in
-                <foreach collection="allSubCustomerIds" item="customerId" open="(" separator="," close=" )">
+                <foreach collection="allCustomerIds" item="customerId" open="(" separator="," close=" )">
                     #{customerId}
                 </foreach>
             </if>
@@ -377,9 +377,9 @@
         <if test="parentAgencyId != null and parentAgencyId != ''">
             AND scg.PARENT_AGENCY_ID = #{parentAgencyId}
         </if>
-        <if test="allSubCustomerIds != null and allSubCustomerIds.size() > 0">
+        <if test="allCustomerIds != null and allCustomerIds.size() > 0">
             and scg.customer_id in
-            <foreach collection="allSubCustomerIds" item="customerId" open="(" separator="," close=" )">
+            <foreach collection="allCustomerIds" item="customerId" open="(" separator="," close=" )">
                 #{customerId}
             </foreach>
         </if>