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