From 3ab0aeae4ae501a4c0cb1557c40c833ebc499b93 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 25 May 2021 09:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenProjectCategoryOrgDailyServiceImpl.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index 432e71f2b7..4a0fecd235 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -378,12 +378,12 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                         });
                     });
                     Map<Boolean, List<CategoryProjectResultDTO>> groupByStatus = categoryProjectGrid.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getStatus));
-                    // 取出分类标签code不一样的数据
+                    // 取出分类标签code同agency级别不一样的数据
                     List<CategoryProjectResultDTO> categoryProjectResultDTOS1 = groupByStatus.get(false);
                     categoryProjectResultDTOS.addAll(categoryProjectResultDTOS1);
                 }
             }
-//            result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);
+            result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);
             /**
              * 查询父子客户所有的分类，根据分类分组，然后把agencyId统一换成父客户的
              * 在保存一份子客户自己agencyId的
@@ -409,6 +409,8 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 }
                 // 此时的 'categoryProjectResultDTOS' 等于 父子客户所有的分类标签
                 Map<String, List<CategoryProjectResultDTO>> groupByCategoryCode = categoryProjectResultDTOS.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getCategoryCode));
+                // 这时的result集合要清空,因为被上边使用 【result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);】
+                result.clear();
                 List<ScreenProjectCategoryOrgDailyEntity> finalResult = result;
                 groupByCategoryCode.forEach((code, list) -> {
                     ScreenProjectCategoryOrgDailyEntity e = new ScreenProjectCategoryOrgDailyEntity();