no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -470,13 +470,15 @@ public class UserLogic {
             }
 
 
-            if (!StringUtil.isEmpty(userWait.getWorkerNumber()) && userWaitService.lambdaQuery().in(UserWait::getWorkerNumber, userWait.getWorkerNumber())
-                    .eq(UserWait::getWebsitId, userWait.getWebsitId()).count()
-                    > 0)
+            if (!StringUtil.isEmpty(userWait.getWorkerNumber())
+                    && userWaitService.lambdaQuery()
+                    .in(UserWait::getWorkerNumber, userWait.getWorkerNumber())
+                    .eq(UserWait::getWebsitId, userWait.getWebsitId())
+                    .count() > 0)
                 throw new RemoteServiceException("不同师傅不能导入重复师傅编号，请检查" + userWait.getMobile() + "!");
 
 
-            if (userWaits.stream().anyMatch(item -> item.getWorkerNumber().equals(userWait.getWorkerNumber()))) {
+            if (userWaits.stream().anyMatch(item -> StringUtils.isNotBlank(item.getWorkerNumber()) && item.getWorkerNumber().equals(userWait.getWorkerNumber()))) {
                 throw new RemoteServiceException("不同师傅不能导入重复师傅编号，请检查" + userWait.getMobile() + "!");
             }