|
@@ -74,8 +74,10 @@ public class JcJyItemChargeServiceImpl implements JcJyItemChargeService {
|
|
|
|
|
|
@Override
|
|
|
public List<JyZdItem> queryJcJyItemByCommonParams(String commonParams) {
|
|
|
+ Integer pageSize =2000;
|
|
|
if (StringUtils.isBlank(commonParams)) {
|
|
|
commonParams = null;
|
|
|
+ pageSize =20;
|
|
|
}
|
|
|
if (SignUtil.isAlpha(commonParams)) {
|
|
|
commonParams = commonParams.toUpperCase();
|
|
@@ -84,7 +86,7 @@ public class JcJyItemChargeServiceImpl implements JcJyItemChargeService {
|
|
|
commonParams = "%" + commonParams.toUpperCase() + "%";
|
|
|
}
|
|
|
List<JyZdItem> jyZdItemList = jcJyItemChargeMapper.selectJcJyItemByCommonParams(commonParams);
|
|
|
- List<JyZdItem> zlList = zdChargeItemMapper.selectZlByCommonParams(commonParams, null, null, 20);
|
|
|
+ List<JyZdItem> zlList = zdChargeItemMapper.selectZlByCommonParams(commonParams, null, null, pageSize);
|
|
|
if (jyZdItemList == null) {
|
|
|
jyZdItemList = zlList;
|
|
|
} else {
|