xuq1

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

@@ -153,7 +153,7 @@ public class WorkerWarrantyLogic {
         //网点名称
         Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
                 .eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .in(adminUser.getType() == 0, AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
                 .eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
                 .list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
 
@@ -163,6 +163,7 @@ public class WorkerWarrantyLogic {
         Map<String, User> userMap = userService.lambdaQuery()
                 .eq(User::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .eq(User::getType,"WORKER")
+                .and(item -> item.ne(User::getMobile,"").or().isNotNull(User::getMobile))
                 .list().stream().collect(Collectors.toMap(User::getMobile, Function.identity()));
 
         for (int i = 0; i < objects.size(); i++) {