Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -761,20 +761,24 @@ public class OrderBaseLogic {
                     .in(WebsitUser::getUserId, allTeamList.stream().map(WorkerTeamBean::getWorkerId).collect(Collectors.toList()))
                     .list();
 
-            for (WebsitUser websitUser : websitUserList) {
-                final User user = userMap.get(websitUser.getUserId());
-                if (Objects.nonNull(user)) {
-                    WorkerTeamBean bean = new WorkerTeamBean();
-                    bean.setWorkerId(user.getUserId());
-                    bean.setWorkerName(user.getNickName());
-                    bean.setWorkerNumber(user.getWorkerNumber());
-                    bean.setWorkerMobile(user.getMobile());
-                    bean.setWorkerIdCard(user.getIdCard());
-                    if (workerTeamMap.size() == 0) {
-                        // workerTeamMap数量为0时, 默认选中
-                        bean.setIsSelect(true);
+            if (CollectionUtil.isNotEmpty(websitUserList)) {
+                long teamCount = websitUserList.stream().filter(v -> userMap.containsKey(v.getUserId())).count();
+
+                for (WebsitUser websitUser : websitUserList) {
+                    final User user = userMap.get(websitUser.getUserId());
+                    if (Objects.nonNull(user)) {
+                        WorkerTeamBean bean = new WorkerTeamBean();
+                        bean.setWorkerId(user.getUserId());
+                        bean.setWorkerName(user.getNickName());
+                        bean.setWorkerNumber(user.getWorkerNumber());
+                        bean.setWorkerMobile(user.getMobile());
+                        bean.setWorkerIdCard(user.getIdCard());
+                        if (workerTeamMap.size() == 0 && teamCount == 1) {
+                            // workerTeamMap数量为0时, 默认选中
+                            bean.setIsSelect(true);
+                        }
+                        workerTeamMap.put(bean.getWorkerId(), bean);
                     }
-                    workerTeamMap.put(bean.getWorkerId(), bean);
                 }
             }
         }