diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index c5ba02c72..5ef7cfbe3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -756,7 +756,7 @@ public class DeskServiceImpl implements DeskService { List lines = lineInfoDAO.getLines(lineIds); List pointId = shopInfoList.stream().filter(x -> Objects.nonNull(x.getPointId())).map(ShopInfoDO::getPointId).collect(Collectors.toList()); - + List investmentUserIds = shopInfoList.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toList()); List pointListByIds = pointInfoDAO.getPointListByIds(pointId); Map pointMap = pointListByIds.stream().collect(Collectors.toMap(PointInfoDO::getId, Function.identity())); //将shopInfoList 转为map @@ -769,7 +769,10 @@ public class DeskServiceImpl implements DeskService { List regionIds = shopInfoList.stream().map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList()); List developmentManagers = shopInfoList.stream().filter(x -> StringUtil.isNotEmpty(x.getShopManagerUserId())).map(ShopInfoDO::getShopManagerUserId).distinct().collect(Collectors.toList()); - Map userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); + Set userIds = new HashSet<>(); + userIds.addAll(investmentUserIds); + userIds.addAll(developmentManagers); + Map userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIds)); Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); List remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, subStageStatusList); Map remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopId, Function.identity())); @@ -782,6 +785,7 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType()); preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode()); preparationCommonPendingVO.setShopAddress(shopInfoDO.getDetailAddress()); + preparationCommonPendingVO.setInvestmentManager(userNameMap.get(shopInfoDO.getInvestmentManager())); preparationCommonPendingVO.setSignType(signTypeMap.getOrDefault(x.getShopId(), new SignFranchiseDO()).getSignType()); preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); preparationCommonPendingVO.setLineId(shopInfoDO.getLineId());