需求

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

@@ -55,9 +55,10 @@ public class AdminWebsitController {
             @RequestParam(required = false) String orderSourceId,
             @RequestParam(required = false) String orderSmallId,
             @RequestParam(required = false) Boolean queryPartsWebsit,
+            @RequestParam(required = false)   @ApiParam(value = "网点属性 SELF=自建网点 MAJOR=第三方专业网点 MERCHANT=第三方经销商家网点")String attr,
             @RequestParam(required = false) Integer level
     ) {
-        List<AdminWebsit> list = adminWebsitLogic.list(websitId,websitName,type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSourceId, queryPartsWebsit, level);
+        List<AdminWebsit> list = adminWebsitLogic.list(attr,websitId,websitName,type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSourceId, queryPartsWebsit, level);
         return ResponseHelper.success(list);
     }
 

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

@@ -131,7 +131,7 @@ public class AdminWebsitLogic {
         return parentList;
     }
 
-    public List<AdminWebsit> list(String websitId,String websitName,String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
+    public List<AdminWebsit> list(String attr,String websitId,String websitName,String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
                                   String orderSmallId, String orderSourceId, Boolean queryPartsWebsit, Integer level) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
@@ -145,8 +145,8 @@ public class AdminWebsitLogic {
                     .eq(!StringUtil.isEmpty(categoryId), WebsitDispatch::getCategoryId, categoryId)
                     .eq(!StringUtil.isEmpty(orderSmallId), WebsitDispatch::getOrderSmallId, orderSmallId)
                     .eq(!StringUtil.isEmpty(orderSourceId), WebsitDispatch::getOrderSource, orderSourceId)
-                    .eq(!StringUtil.isEmpty(websitId), WebsitDispatch::getWebsitId, websitId)
-                    .eq(!StringUtil.isEmpty(websitName), WebsitDispatch::getWebsitName, websitName)
+                    .like(!StringUtil.isEmpty(websitId), WebsitDispatch::getWebsitId, websitId)
+                    .like(!StringUtil.isEmpty(websitName), WebsitDispatch::getWebsitName, websitName)
                     .list().stream().map(WebsitDispatch::getWebsitId).collect(Collectors.toList());
         }
 
@@ -157,8 +157,9 @@ public class AdminWebsitLogic {
                 .in(StringUtils.isNotBlank(streetCode) && !CollectionUtils.isEmpty(websitIds), AdminWebsit::getWebsitId, websitIds)
                 .eq(isIncre != null, AdminWebsit::getIsIncre, isIncre)
                 .eq(status != null, AdminWebsit::getStatus, status)
-                .eq(!StringUtil.isEmpty(websitId), AdminWebsit::getWebsitId, websitId)
-                .eq(!StringUtil.isEmpty(websitName), AdminWebsit::getName, websitName)
+                .like(!StringUtil.isEmpty(websitId), AdminWebsit::getWebsitId, websitId)
+                .like(!StringUtil.isEmpty(websitName), AdminWebsit::getName, websitName)
+                .eq(!StringUtil.isEmpty(attr), AdminWebsit::getAttr, attr)
                 .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && (isAll == null || !isAll), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
                 .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatIds())
                 .and(Objects.nonNull(queryPartsWebsit) && queryPartsWebsit, v -> v.isNotNull(AdminWebsit::getPartsWebsitId)