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> 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 brandList = brandService.listBrand(keyword, pageNum, pageSize); + List 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 listBrand(String keyword, int pageNum, int pageSize); + List 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 listBrand(String keyword, int pageNum, int pageSize) { + public List 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); }