Browse Source

no message

FengChaoYu 6 months ago
parent
commit
5949ee35a4

+ 3 - 2
mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminWebsitController.java

@@ -52,9 +52,10 @@ public class AdminWebsitController {
             @RequestParam(required = false) String categoryId,
             @RequestParam(required = false) String categoryId,
             @RequestParam(required = false) String orderSourceId,
             @RequestParam(required = false) String orderSourceId,
             @RequestParam(required = false) String orderSmallId,
             @RequestParam(required = false) String orderSmallId,
-            @RequestParam(required = false) Boolean queryPartsWebsit
+            @RequestParam(required = false) Boolean queryPartsWebsit,
+            @RequestParam(required = false) Integer level
     ) {
     ) {
-        List<AdminWebsit> list = adminWebsitLogic.list(type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSourceId, queryPartsWebsit);
+        List<AdminWebsit> list = adminWebsitLogic.list(type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSourceId, queryPartsWebsit, level);
         return ResponseHelper.success(list);
         return ResponseHelper.success(list);
     }
     }
 
 

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

@@ -121,7 +121,7 @@ public class AdminWebsitLogic {
     }
     }
 
 
     public List<AdminWebsit> list(String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
     public List<AdminWebsit> list(String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
-                                  String orderSmallId, String orderSourceId, Boolean queryPartsWebsit) {
+                                  String orderSmallId, String orderSourceId, Boolean queryPartsWebsit, Integer level) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
 
 
 
@@ -139,6 +139,7 @@ public class AdminWebsitLogic {
 
 
 
 
         List<AdminWebsit> list = adminWebsitService.lambdaQuery()
         List<AdminWebsit> list = adminWebsitService.lambdaQuery()
+                .eq(Objects.nonNull(level), AdminWebsit::getLevel, level)
                 .eq(StringUtils.isNotBlank(type), AdminWebsit::getType, type)
                 .eq(StringUtils.isNotBlank(type), AdminWebsit::getType, type)
                 .in(StringUtils.isNotBlank(streetCode) && !CollectionUtils.isEmpty(websitIds), AdminWebsit::getWebsitId, websitIds)
                 .in(StringUtils.isNotBlank(streetCode) && !CollectionUtils.isEmpty(websitIds), AdminWebsit::getWebsitId, websitIds)
                 .eq(isIncre != null, AdminWebsit::getIsIncre, isIncre)
                 .eq(isIncre != null, AdminWebsit::getIsIncre, isIncre)