diff --git a/bweb/src/main/java/com/bweb/controller/BsMerchantController.java b/bweb/src/main/java/com/bweb/controller/BsMerchantController.java index 1236c85..4747fd8 100644 --- a/bweb/src/main/java/com/bweb/controller/BsMerchantController.java +++ b/bweb/src/main/java/com/bweb/controller/BsMerchantController.java @@ -280,6 +280,7 @@ public class BsMerchantController { @RequestParam(value = "chainBrandId", required = false) Long chainBrandId, @RequestParam(value = "cityCode", required = false) String cityCode, @RequestParam(value = "areaCode", required = false) String areaCode, + @RequestParam(value = "status", required = false) Integer status, @RequestParam(value = "pageNum", required = true) Integer pageNum, @RequestParam(value = "pageSize", required = true) Integer pageSize) { try { @@ -291,6 +292,7 @@ public class BsMerchantController { map.put("chainBrandId", chainBrandId); map.put("cityCode", cityCode); map.put("areaCode", areaCode); + map.put("status", status); PageHelper.startPage(pageNum,pageSize); return ResponseMsgUtil.success(new PageInfo<>(merchantService.getMerchantList(map))); diff --git a/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantServiceImpl.java b/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantServiceImpl.java index 55bc3ef..3b3ba96 100644 --- a/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantServiceImpl.java @@ -188,6 +188,10 @@ public class BsMerchantServiceImpl implements BsMerchantService { criteria.andAreaCodeEqualTo(MapUtils.getLong(param, "areaCode")); } + if (MapUtils.getLong(param, "status") != null) { + criteria.andAreaCodeEqualTo(MapUtils.getLong(param, "status")); + } + if (StringUtils.isNotBlank(MapUtils.getString(param, "merNo"))) { criteria.andMerNoLike("%"+MapUtils.getString(param, "merNo")+"%"); }