From bd7d9ffb9272f4be05497dd3d7846accfcf5d799 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 11 May 2021 16:00:41 +0800
Subject: [PATCH] =?UTF-8?q?contactmasslinechart=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/PartyMemberLeadServiceImpl.java        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java
index fce388ec23..bfa4f721e9 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java
@@ -119,11 +119,17 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) {
+        ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO();
 
         List<String> subAgencyIdorGridIdList=screenCustomerAgencyService.getNextAgencyIds(contactMassLineChartFormDTO.getAreaCode(),contactMassLineChartFormDTO.getAgencyId());
         log.info("当前组织的下级id:"+JSON.toJSONString(subAgencyIdorGridIdList));
-
-        ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO();
+        if(CollectionUtils.isEmpty(subAgencyIdorGridIdList)){
+            //如果没有下级组织或者直属网格
+            result.setXAxis(new ArrayList<>());
+            result.setGroupMemberData(new ArrayList<>());
+            result.setGroupData(new ArrayList<>());
+            return result;
+        }
         // List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChart(contactMassLineChartFormDTO.getAgencyId());
         //多客户版修改如下：
         List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChartByAgencyIds(subAgencyIdorGridIdList);