diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java index 60abfda3c..fa3909557 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java @@ -161,6 +161,11 @@ public class StoreServiceImpl implements StoreService { } List storeIds = CollStreamUtil.toList(list, StoreDO::getStoreId); Map signerMap = storeMasterSignerInfoDAO.getSignerMapByStoreIds(storeIds); + + + List userIds = list.stream().filter(Objects::nonNull).map(StoreDO::getJoinSupervision).collect(Collectors.toList()); + Map userNameMap = enterpriseUserDAO.getUserMap(userIds); + List result = new ArrayList<>(); list.forEach(x->{ StoreUserPositionDTO storeUserPositionDTO = new StoreUserPositionDTO(); @@ -192,6 +197,15 @@ public class StoreServiceImpl implements StoreService { userList.add(new StoreUserDTO(signerInfoDO.getSigner2Name(), signerInfoDO.getSigner2Mobile())); } } + EnterpriseUserDO enterpriseUserDO = userNameMap.get(x.getJoinSupervision()); + if (Objects.nonNull(enterpriseUserDO)){ + StoreUserDTO storeUserDTO = new StoreUserDTO(); + storeUserDTO.setUserId(enterpriseUserDO.getUserId()); + storeUserDTO.setUserName(enterpriseUserDO.getName()); + storeUserDTO.setMobile(enterpriseUserDO.getMobile()); + storeUserDTO.setPositionName("招商经理"); + userList.add(storeUserDTO); + } storeUserPositionDTO.setUserList(userList); result.add(storeUserPositionDTO); });