xuq1

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

@@ -147,7 +147,7 @@ public class WorkerWarrantyLogic {
 
         List<WorkerWarranty> workerWarrantyList = workerWarrantyService.lambdaQuery()
                 .eq(WorkerWarranty::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .in(adminUser.getType() == 0, WorkerWarranty::getWebsitId, adminUser.getAdminWebsitIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getType().equals(1), WorkerWarranty::getWebsitId, adminUser.getAdminWebsitIds())
                 .list();
 
         //网点名称
@@ -158,7 +158,6 @@ public class WorkerWarrantyLogic {
                 .list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
 
 
-
         //网点名称
         Map<String, User> userMap = userService.lambdaQuery()
                 .eq(User::getCompanyWechatId, adminUser.getCompanyWechatId())