no message

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

@@ -756,6 +756,7 @@ public class OrderBaseLogic {
 
         final List<WorkerTeam> teamList = workerTeamService.lambdaQuery()
                 .eq(WorkerTeam::getCompanyWechatId, orderBase.getCompanyWechatId())
+                .eq(WorkerTeam::getWebsitId, orderBase.getWebsitId())
                 .and(v -> v.eq(WorkerTeam::getMasterWorkerId, workerId)
                         .or()
                         .eq(WorkerTeam::getAssistantWorkerId, workerId))

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

@@ -123,7 +123,7 @@ public class WorkerTeamLogic {
                 .one();
         if (Objects.nonNull(count1)) {
             throw new RemoteServiceException(workerTeam.getWebsitId() + "已存在一组同样师傅的记录" + workerTeam.getMasterWorkerId()
-                    + "," + workerTeam.getAssistantWorkerId() + (count.getStatus().equals(StateEnum.OFF.getKey()) ? ", 请设为“有效”" : ""));
+                    + "," + workerTeam.getAssistantWorkerId() + (count1.getStatus().equals(StateEnum.OFF.getKey()) ? ", 请设为“有效”" : ""));
         }