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

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerTeamLogic.java

@@ -102,6 +102,9 @@ public class WorkerTeamLogic {
                 .ne(StringUtils.isNotBlank(workerId), WebsitUser::getWorkerNumber, workerId)
                 .eq(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey())
                 .list();
+        if (CollectionUtil.isEmpty(websitUsers)) {
+            return new ArrayList<>();
+        }
         final List<User> userList = userService.lambdaQuery()
                 .eq(User::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .in(User::getUserId, websitUsers.stream().map(WebsitUser::getUserId).collect(Collectors.toList()))