|
|
@@ -128,10 +128,12 @@ public class WorkerTeamLogic {
|
|
|
final Map<String, String> userMap = userList.stream().collect(Collectors.toMap(User::getWorkerNumber, User::getNickName));
|
|
|
List<WebsitWorkerBean> beanList = new ArrayList<>();
|
|
|
for (WebsitUser websitUser : websitUsers) {
|
|
|
- WebsitWorkerBean bean = new WebsitWorkerBean();
|
|
|
- bean.setWorkerId(websitUser.getWorkerNumber());
|
|
|
- bean.setWorkerName(userMap.get(websitUser.getWorkerNumber()));
|
|
|
- beanList.add(bean);
|
|
|
+ if (userMap.containsKey(websitUser.getWorkerNumber())) {
|
|
|
+ WebsitWorkerBean bean = new WebsitWorkerBean();
|
|
|
+ bean.setWorkerId(websitUser.getWorkerNumber());
|
|
|
+ bean.setWorkerName(userMap.get(websitUser.getWorkerNumber()));
|
|
|
+ beanList.add(bean);
|
|
|
+ }
|
|
|
}
|
|
|
return beanList;
|
|
|
}
|