From 70a8406ac3ef305ad6d50f20866a1b104533d084 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 31 Aug 2021 15:03:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=86=8D=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java    | 1 -
 1 file changed, 1 deletion(-)

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 23f44b8184..902981793a 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
@@ -436,7 +436,6 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                         e.setCustomerId(customerId);
                         finalSonResult.add(e);
                     });
-                    result.addAll(finalSonResult);
                 }
                 // 内部客户与外部客户 相同的分类累加
                 if (!CollectionUtils.isEmpty(categoryProjectExists)){

From 8df605b3cdf2cfb0e11233506db7d1d8b6f2e529 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 1 Sep 2021 09:56:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partymember/service/impl/PartyMemberConfirmServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index 80cc4cc91e..1610de67c6 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -193,7 +193,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 				PartymemberInfoEntity.class);
 		PartymemberInfoDTO info = partymemberInfoService.getPartyMemberInfoByUser(partyMemberInfoDTO.getCustomerId(), partyMemberInfoDTO.getUserId());
 		if (null != info) {
-			partyMemberInfoDTO.setId(info.getId());
+			partyMemberInfoEntity.setId(info.getId());
 		}
 		if (confirmAutoDTO == null || !confirmAutoDTO.getComparisonResults()) {
 			log.info("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO));