傅行帆 5 年前
父节点
当前提交
3dea2cc3d5
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3
    2
      src/main/java/com/huiju/estateagents/controller/TaGoodsController.java

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaGoodsController.java 查看文件

7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.common.CommConstant;
9
 import com.huiju.estateagents.common.JWTUtils;
9
 import com.huiju.estateagents.common.JWTUtils;
10
+import com.huiju.estateagents.common.StringUtils;
10
 import com.huiju.estateagents.entity.TaGoods;
11
 import com.huiju.estateagents.entity.TaGoods;
11
 import com.huiju.estateagents.service.ITaGoodsService;
12
 import com.huiju.estateagents.service.ITaGoodsService;
12
 import org.slf4j.Logger;
13
 import org.slf4j.Logger;
163
     @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
164
     @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
164
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
165
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
165
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
166
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
166
-                                    @RequestParam(value = "buildingId",required = false) Integer buildingId,
167
+                                    @RequestParam(value = "buildingId",required = false) String buildingId,
167
                                     @RequestParam(value = "orgId",required = false) Integer orgId){
168
                                     @RequestParam(value = "orgId",required = false) Integer orgId){
168
         ResponseBean responseBean = new ResponseBean();
169
         ResponseBean responseBean = new ResponseBean();
169
         try {
170
         try {
171
             IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
172
             IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
172
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
173
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
173
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
174
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
174
-            if (null != buildingId){
175
+            if (!StringUtils.isEmpty(buildingId)){
175
                 queryWrapper.eq("building_id", buildingId);
176
                 queryWrapper.eq("building_id", buildingId);
176
             }
177
             }
177
             if (null != orgId){
178
             if (null != orgId){