Merge branch 'develop' into release_temp

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)){

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));