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

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

@@ -155,7 +155,7 @@ public class WorkerTeamLogic {
         if (!apply.getStatus().equals(ExamineStatusEnum.WAIT.getKey())) {
             throw new RemoteServiceException("申请记录非”待确认“状态");
         }
-        if (apply.getMasterWorkerId().equals(current.getUser().getWorkerNumber())) {
+        if (apply.getMasterWorkerId().equals(current.getUser().getUserId())) {
             throw new RemoteServiceException("申请发起人不能”确认“记录");
         }
         if (status.getKey().equals(ExamineStatusEnum.OK.getKey())) {
@@ -201,6 +201,9 @@ public class WorkerTeamLogic {
                 .ne(WebsitUser::getUserId, current.getUserId())
                 .in(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.OK.getKey(), ExamineWorkerStatusEnum.EXPIRED.getKey())
                 .list();
+        if (CollectionUtil.isEmpty(websitUsers)) {
+            return new ArrayList<>();
+        }
         final List<User> userList = userService.lambdaQuery()
                 .eq(User::getCompanyWechatId, current.getUser().getCompanyWechatId())
                 .in(User::getUserId, websitUsers.stream().map(WebsitUser::getUserId).collect(Collectors.toList()))