From 89c84ce8da41bb33a4e60d522ede888137335b55 Mon Sep 17 00:00:00 2001
From: macro <zhenghong1991@126.com>
Date: Fri, 11 Nov 2022 17:05:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=93=81=E7=89=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/macro/mall/controller/PmsBrandController.java  | 3 ++-
 .../main/java/com/macro/mall/service/PmsBrandService.java   | 2 +-
 .../com/macro/mall/service/impl/PmsBrandServiceImpl.java    | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mall-admin/src/main/java/com/macro/mall/controller/PmsBrandController.java b/mall-admin/src/main/java/com/macro/mall/controller/PmsBrandController.java
index 7cc349a..bb607e2 100644
--- a/mall-admin/src/main/java/com/macro/mall/controller/PmsBrandController.java
+++ b/mall-admin/src/main/java/com/macro/mall/controller/PmsBrandController.java
@@ -79,9 +79,10 @@ public class PmsBrandController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
     public CommonResult<CommonPage<PmsBrand>> getList(@RequestParam(value = "keyword", required = false) String keyword,
+                                                      @RequestParam(value = "showStatus",required = false) Integer showStatus,
                                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                       @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
-        List<PmsBrand> brandList = brandService.listBrand(keyword, pageNum, pageSize);
+        List<PmsBrand> brandList = brandService.listBrand(keyword,showStatus,pageNum, pageSize);
         return CommonResult.success(CommonPage.restPage(brandList));
     }
 
diff --git a/mall-admin/src/main/java/com/macro/mall/service/PmsBrandService.java b/mall-admin/src/main/java/com/macro/mall/service/PmsBrandService.java
index ad81947..2bfc3a6 100644
--- a/mall-admin/src/main/java/com/macro/mall/service/PmsBrandService.java
+++ b/mall-admin/src/main/java/com/macro/mall/service/PmsBrandService.java
@@ -40,7 +40,7 @@ public interface PmsBrandService {
     /**
      * 分页查询品牌
      */
-    List<PmsBrand> listBrand(String keyword, int pageNum, int pageSize);
+    List<PmsBrand> listBrand(String keyword, Integer showStatus, int pageNum, int pageSize);
 
     /**
      * 获取品牌详情
diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/PmsBrandServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/PmsBrandServiceImpl.java
index 9958754..c426bf3 100644
--- a/mall-admin/src/main/java/com/macro/mall/service/impl/PmsBrandServiceImpl.java
+++ b/mall-admin/src/main/java/com/macro/mall/service/impl/PmsBrandServiceImpl.java
@@ -13,7 +13,6 @@ import com.macro.mall.service.PmsBrandService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -75,7 +74,7 @@ public class PmsBrandServiceImpl implements PmsBrandService {
     }
 
     @Override
-    public List<PmsBrand> listBrand(String keyword, int pageNum, int pageSize) {
+    public List<PmsBrand> listBrand(String keyword, Integer showStatus, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         PmsBrandExample pmsBrandExample = new PmsBrandExample();
         pmsBrandExample.setOrderByClause("sort desc");
@@ -83,6 +82,9 @@ public class PmsBrandServiceImpl implements PmsBrandService {
         if (!StrUtil.isEmpty(keyword)) {
             criteria.andNameLike("%" + keyword + "%");
         }
+        if(showStatus!=null){
+            criteria.andShowStatusEqualTo(showStatus);
+        }
         return brandMapper.selectByExample(pmsBrandExample);
     }