FengChaoYu 10 kuukautta sitten
vanhempi
commit
aca969307a

+ 5 - 6
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/worker/WorkerTeamLogic.java

@@ -22,9 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -126,16 +124,17 @@ public class WorkerTeamLogic {
                 .in(User::getUserId, websitUsers.stream().map(WebsitUser::getUserId).collect(Collectors.toList()))
                 .list();
         final Map<String, String> userMap = userList.stream().collect(Collectors.toMap(User::getWorkerNumber, User::getNickName));
-        List<WebsitWorkerBean> beanList = new ArrayList<>();
+
+        Map<String, WebsitWorkerBean> workerMap = new HashMap<>();
         for (WebsitUser websitUser : websitUsers) {
             if (userMap.containsKey(websitUser.getWorkerNumber())) {
                 WebsitWorkerBean bean = new WebsitWorkerBean();
                 bean.setWorkerId(websitUser.getWorkerNumber());
                 bean.setWorkerName(userMap.get(websitUser.getWorkerNumber()));
-                beanList.add(bean);
+                workerMap.put(bean.getWorkerId(), bean);
             }
         }
-        return beanList;
+        return new ArrayList<>(workerMap.values());
     }