From 99536ae6021afaeaa45fa362ea4124e312078d51 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 25 Feb 2025 15:07:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=80=89=E5=9D=80=E4=B8=93=E5=91=98null?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/service/impl/LineServiceImpl.java   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
index 43a2d1ca4..5d93e8e3b 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
@@ -270,8 +270,8 @@ public class LineServiceImpl implements LineService {
         Map<Long, Set<String>> investmentManagerIdMapByLineId = shopInfoDOS.stream().collect(Collectors.groupingBy(ShopInfoDO::getLineId, Collectors.mapping(ShopInfoDO::getInvestmentManager, Collectors.toSet())));
         Map<Long, Set<String>> developmentManagerMap = shopInfoDOS.stream().collect(Collectors.groupingBy(ShopInfoDO::getLineId, Collectors.mapping(ShopInfoDO::getDevelopmentManager, Collectors.toSet())));
 
-        Set<String> investmentManagerIds = shopInfoDOS.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet());
-        Set<String> developmentManagerIds = shopInfoDOS.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet());
+        Set<String> investmentManagerIds = shopInfoDOS.stream().filter(x -> StringUtils.isNotBlank(x.getInvestmentManager())).map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet());
+        Set<String> developmentManagerIds = shopInfoDOS.stream().filter(x -> StringUtils.isNotBlank(x.getDevelopmentManager())).map(ShopInfoDO::getDevelopmentManager).collect(Collectors.toSet());
         Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS);
         List<Long> wantShopAreaIdList = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
         Map<Long, String> wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIdList);
@@ -305,22 +305,32 @@ public class LineServiceImpl implements LineService {
             Set<String> userIdSet = investmentManagerIdMapByLineId.getOrDefault(x.getId(), new HashSet<>());
             userIdSet.add(x.getInvestmentManager());
             for (String s : userIdSet) {
-                investmentManagerUserName.append(userNameMap.get(s)).append(",");
+                if (investmentManagerUserName.length() ==0) {
+                    investmentManagerUserName.append(userNameMap.get(s));
+                }else{
+                    investmentManagerUserName.append(",").append(userNameMap.get(s));
+                }
             }
             StringBuilder developmentManagerUserName = new StringBuilder();
             Set<String> developmentManagerIdsSet = developmentManagerMap.getOrDefault(x.getId(), new HashSet<>());
-            developmentManagerIdsSet.add(x.getDevelopmentManager());
+            if (StringUtils.isNotBlank(x.getDevelopmentManager())) {
+                developmentManagerIdsSet.add(x.getDevelopmentManager());
+            }
             for (String s : developmentManagerIdsSet) {
-                developmentManagerUserName.append(userNameMap.get(s)).append(",");
+                if (investmentManagerUserName.length() ==0) {
+                    developmentManagerUserName.append(userNameMap.get(s));
+                }else{
+                    developmentManagerUserName.append(",").append(userNameMap.get(s));
+                }
             }
             partnerListVO.setUpdateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getUpdateTime()));
             partnerListVO.setLineSourceName(channelMapByIds.get(x.getLineSource()));
             partnerListVO.setJoinStatus(x.getJoinStatus());
             partnerListVO.setJoinMode(x.getJoinMode());
             partnerListVO.setPartnerNum(x.getPartnerNum());
-            partnerListVO.setInvestmentManagerUserName(investmentManagerUserName.substring(0, investmentManagerUserName.length() - 1));
+            partnerListVO.setInvestmentManagerUserName(investmentManagerUserName.toString());
             partnerListVO.setUpdateUserName(userNameMap.get(x.getUpdateUserId()));
-            partnerListVO.setDevelopmentManagerUserName(developmentManagerUserName.substring(0, developmentManagerUserName.length() - 1));
+            partnerListVO.setDevelopmentManagerUserName(developmentManagerUserName.toString());
             partnerListVO.setWantShopNum(x.getWantShopNum());
             result.add(partnerListVO);
         });