需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -110,14 +110,17 @@ public class AdminWebsitLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
 
-        List<String> websitIds = websitDispatchService.lambdaQuery()
-                .eq(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitDispatch::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .eq(!StringUtil.isEmpty(streetCode), WebsitDispatch::getStreetCode, streetCode)
-                .eq(!StringUtil.isEmpty(channelId), WebsitDispatch::getDictCode, channelId)
-                .eq(!StringUtil.isEmpty(categoryId), WebsitDispatch::getCategoryId, categoryId)
-                .eq(!StringUtil.isEmpty(orderSmallId), WebsitDispatch::getOrderSmallId, orderSmallId)
-                .eq(!StringUtil.isEmpty(orderSourceId), WebsitDispatch::getOrderSource, orderSourceId)
-                .list().stream().map(WebsitDispatch::getWebsitId).collect(Collectors.toList());
+        List<String> websitIds = new ArrayList<>();
+        if (!StringUtil.isEmpty(streetCode)) {
+            websitIds = websitDispatchService.lambdaQuery()
+                    .eq(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitDispatch::getCompanyWechatId, adminUser.getCompanyWechatId())
+                    .eq(!StringUtil.isEmpty(streetCode), WebsitDispatch::getStreetCode, streetCode)
+                    .eq(!StringUtil.isEmpty(channelId), WebsitDispatch::getDictCode, channelId)
+                    .eq(!StringUtil.isEmpty(categoryId), WebsitDispatch::getCategoryId, categoryId)
+                    .eq(!StringUtil.isEmpty(orderSmallId), WebsitDispatch::getOrderSmallId, orderSmallId)
+                    .eq(!StringUtil.isEmpty(orderSourceId), WebsitDispatch::getOrderSource, orderSourceId)
+                    .list().stream().map(WebsitDispatch::getWebsitId).collect(Collectors.toList());
+        }
 
 
         List<AdminWebsit> list = adminWebsitService.lambdaQuery()