|
@@ -130,11 +130,14 @@ public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> i
|
|
|
String code1 = paramsMap.get("code");
|
|
|
String pageNo = paramsMap.get("pageNo");
|
|
|
String pageSize = paramsMap.get("pageSize");
|
|
|
+ String areaCode = paramsMap.get("areaCode");
|
|
|
+ String leader = paramsMap.get("leader");
|
|
|
Page<BaseFarm> page = new Page<>(Integer.valueOf(pageNo), Integer.valueOf(pageSize));
|
|
|
QueryWrapper<BaseFarm> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.like(StringUtils.isNotBlank(farmName), "farm_name", farmName);
|
|
|
queryWrapper.like(StringUtils.isNotBlank(farmCode), "farm_code", farmCode);
|
|
|
- queryWrapper.like(StringUtils.isNotBlank(code1), "code1", code1);
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(areaCode), "area_code", areaCode);
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(leader), "leader", leader);
|
|
|
Page<BaseFarm> bizBaseStagePage = baseFarmMapper.selectPage(page, queryWrapper);
|
|
|
return new Result(ResultCode.SUCCESS, bizBaseStagePage);
|
|
|
}
|