fuxingfan 3 年之前
父節點
當前提交
e1a2cd6a82
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5
    1
      src/main/java/com/yunzhi/marketing/xlk/controller/BrandController.java

+ 5
- 1
src/main/java/com/yunzhi/marketing/xlk/controller/BrandController.java 查看文件

6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
 import com.yunzhi.marketing.base.BaseController;
7
 import com.yunzhi.marketing.base.BaseController;
8
 import com.yunzhi.marketing.base.ResponseBean;
8
 import com.yunzhi.marketing.base.ResponseBean;
9
+import com.yunzhi.marketing.common.StringUtils;
9
 import com.yunzhi.marketing.entity.TaBuilding;
10
 import com.yunzhi.marketing.entity.TaBuilding;
10
 import com.yunzhi.marketing.service.ITaBuildingService;
11
 import com.yunzhi.marketing.service.ITaBuildingService;
11
 import com.yunzhi.marketing.xlk.dto.BrandDTO;
12
 import com.yunzhi.marketing.xlk.dto.BrandDTO;
61
     @ApiOperation(value = "admin-品牌开发商表列表", notes = "admin-品牌开发商表列表")
62
     @ApiOperation(value = "admin-品牌开发商表列表", notes = "admin-品牌开发商表列表")
62
     @RequestMapping(value="/admin/brand",method= RequestMethod.GET)
63
     @RequestMapping(value="/admin/brand",method= RequestMethod.GET)
63
     public ResponseBean brandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
64
     public ResponseBean brandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
64
-                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, @RequestHeader("authorization") String token,HttpServletRequest request){
65
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
66
+                                  @RequestParam(value ="brandName",required = false) String brandName,
67
+                                  @RequestHeader("authorization") String token,HttpServletRequest request){
65
         ResponseBean responseBean = new ResponseBean();
68
         ResponseBean responseBean = new ResponseBean();
66
         try {
69
         try {
67
             //使用分页插件
70
             //使用分页插件
68
 		    IPage<Brand> pg = new Page<>(pageNum, pageSize);
71
 		    IPage<Brand> pg = new Page<>(pageNum, pageSize);
69
             LambdaQueryWrapper<Brand> queryWrapper = new LambdaQueryWrapper<>();
72
             LambdaQueryWrapper<Brand> queryWrapper = new LambdaQueryWrapper<>();
70
             queryWrapper.eq(Brand::getOrgId,getOrgId(request));
73
             queryWrapper.eq(Brand::getOrgId,getOrgId(request));
74
+            queryWrapper.like(!StringUtils.isEmpty(brandName),Brand::getBrandName,brandName);
71
             queryWrapper.orderByDesc(Brand::getCreatedTime);
75
             queryWrapper.orderByDesc(Brand::getCreatedTime);
72
 
76
 
73
             IPage<Brand> result = iBrandService.page(pg, queryWrapper);
77
             IPage<Brand> result = iBrandService.page(pg, queryWrapper);