From 042d42b28ea5c38d1baa1dc823cb2c66c9e1a82f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 29 Jun 2021 13:20:06 +0800
Subject: [PATCH] =?UTF-8?q?mynextagency-multic=E8=BF=94=E5=8F=82=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0areaCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ProjectNextAgencyResultDTO.java        | 11 +++++++++++
 .../service/project/impl/ProjectServiceImpl.java      | 10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectNextAgencyResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectNextAgencyResultDTO.java
index 19a92f93bd..9aaf0b6050 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectNextAgencyResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectNextAgencyResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.project.dto.result;
 
+import com.epmet.commons.tools.constant.StrConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -29,5 +30,15 @@ public class ProjectNextAgencyResultDTO implements Serializable {
      * */
     private String orgType;
 
+    /**
+     * orgId对应的areaCode。 只有当前客户有子客户时，才会返回指，否则返回null或者空字符串
+     * */
     private String areaCode;
+
+    public ProjectNextAgencyResultDTO(){
+        this.orgId= StrConstant.EPMETY_STR;
+        this.orgName= StrConstant.EPMETY_STR;
+        this.orgType= StrConstant.EPMETY_STR;
+        this.areaCode= StrConstant.EPMETY_STR;
+    }
 }
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 4d35a8a9ea..9ae8baffc7 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
@@ -483,7 +483,10 @@ public class ProjectServiceImpl implements ProjectService {
                 nextAgency.setOrgId(agencyDTO.getAgencyId());
                 nextAgency.setOrgName(agencyDTO.getAgencyName());
                 nextAgency.setOrgType("agency");
-                nextAgency.setAreaCode(agencyDTO.getAreaCode());
+                if (crmRes.success() && CollectionUtils.isNotEmpty(crmRes.getData())) {
+                    //只有当前客户存在子客户时，才返回areaCode
+                    nextAgency.setAreaCode(agencyDTO.getAreaCode());
+                }
                 resultList.add(nextAgency);
             });
         }
@@ -502,7 +505,10 @@ public class ProjectServiceImpl implements ProjectService {
                 grid.setOrgId(gridDTO.getGridId());
                 grid.setOrgName(gridDTO.getGridName());
                 grid.setOrgType("grid");
-                grid.setAreaCode(gridDTO.getAreaCode());
+                if (crmRes.success() && CollectionUtils.isNotEmpty(crmRes.getData())) {
+                    //只有当前客户存在子客户时，才返回areaCode
+                    grid.setAreaCode(gridDTO.getAreaCode());
+                }
                 resultList.add(grid);
             });
         }