fix:招商经理
This commit is contained in:
@@ -161,6 +161,11 @@ public class StoreServiceImpl implements StoreService {
|
|||||||
}
|
}
|
||||||
List<String> storeIds = CollStreamUtil.toList(list, StoreDO::getStoreId);
|
List<String> storeIds = CollStreamUtil.toList(list, StoreDO::getStoreId);
|
||||||
Map<String, StoreMasterSignerInfoDO> signerMap = storeMasterSignerInfoDAO.getSignerMapByStoreIds(storeIds);
|
Map<String, StoreMasterSignerInfoDO> signerMap = storeMasterSignerInfoDAO.getSignerMapByStoreIds(storeIds);
|
||||||
|
|
||||||
|
|
||||||
|
List<String> userIds = list.stream().filter(Objects::nonNull).map(StoreDO::getJoinSupervision).collect(Collectors.toList());
|
||||||
|
Map<String, EnterpriseUserDO> userNameMap = enterpriseUserDAO.getUserMap(userIds);
|
||||||
|
|
||||||
List<StoreUserPositionDTO> result = new ArrayList<>();
|
List<StoreUserPositionDTO> result = new ArrayList<>();
|
||||||
list.forEach(x->{
|
list.forEach(x->{
|
||||||
StoreUserPositionDTO storeUserPositionDTO = new StoreUserPositionDTO();
|
StoreUserPositionDTO storeUserPositionDTO = new StoreUserPositionDTO();
|
||||||
@@ -192,6 +197,15 @@ public class StoreServiceImpl implements StoreService {
|
|||||||
userList.add(new StoreUserDTO(signerInfoDO.getSigner2Name(), signerInfoDO.getSigner2Mobile()));
|
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);
|
storeUserPositionDTO.setUserList(userList);
|
||||||
result.add(storeUserPositionDTO);
|
result.add(storeUserPositionDTO);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user