|
|
|
@@ -1812,11 +1812,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { |
|
|
|
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0); |
|
|
|
if (null == mids || mids.size() <= 0 ) { |
|
|
|
rentContract.setId(-1L); |
|
|
|
} else { |
|
|
|
rentContract.setMerchantIds(mids); |
|
|
|
if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) { |
|
|
|
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0); |
|
|
|
if (null == mids || mids.size() <= 0 ) { |
|
|
|
rentContract.setId(-1L); |
|
|
|
} else { |
|
|
|
rentContract.setMerchantIds(mids); |
|
|
|
} |
|
|
|
} |
|
|
|
//PageInfo<WxRentContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract)); |
|
|
|
PageInfo<WxRentContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract)); |
|
|
|
|