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 55033489e..c5ba02c72 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 @@ -667,12 +667,15 @@ public class DeskServiceImpl implements DeskService { Map lineMap = lines.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, line -> line)); List pointId = shopInfoList.stream().filter(x -> Objects.nonNull(x.getPointId())).map(ShopInfoDO::getPointId).collect(Collectors.toList()); - + Set investmentUserIds = shopInfoList.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet()); List pointListByIds = pointInfoDAO.getPointListByIds(pointId); Map pointMap = pointListByIds.stream().collect(Collectors.toMap(PointInfoDO::getId, Function.identity())); 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< String> 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.groupingBy(ShopStageRemarkInfoDO::getShopId)); @@ -702,7 +705,7 @@ public class DeskServiceImpl implements DeskService { } preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode()); - preparationCommonPendingVO.setInvestmentManager(lineMap.getOrDefault(x.getLineId(), new PlanLineDTO()).getInvestmentManagerName()); + preparationCommonPendingVO.setInvestmentManager(userNameMap.getOrDefault(shopInfoDO.getInvestmentManager(),"")); preparationCommonPendingVO.setStage(x.getShopStage()); preparationCommonPendingVO.setSubStage(x.getShopSubStage()); preparationCommonPendingVO.setSubStageStatus(x.getShopSubStageStatus()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index c905af0f9..c5b692e9b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -834,8 +834,9 @@ public class ShopServiceImpl implements ShopService { return getUsersByRoleAndRegion(UserRoleEnum.PRESIDENT, shopInfo.getRegionId()); case SHOP_SUB_STAGE_STATUS_160: - case SHOP_SUB_STAGE_STATUS_170: return getUsersByRoleAndRegion(UserRoleEnum.HUO_MA_EMPLOYEE, shopInfo.getRegionId()); + case SHOP_SUB_STAGE_STATUS_170: + return getUsersByRoleAndRegion(UserRoleEnum.IT_EMPLOYEE, shopInfo.getRegionId()); case SHOP_SUB_STAGE_STATUS_230: return getUsersByRoleAndRegion(UserRoleEnum.XIN_FA_SYS_CUSTOMER, shopInfo.getRegionId());