SZHGYL-289修改
This commit is contained in:
@@ -1193,6 +1193,11 @@ public class ContractServiceImpl implements ContractService {
|
|||||||
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
|
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 未查询到相关合同
|
||||||
|
if (CollectionUtils.isEmpty(contractIds)) {
|
||||||
|
return new PageResult<>();
|
||||||
|
}
|
||||||
|
|
||||||
// 分页查询
|
// 分页查询
|
||||||
IPage<NotRespVO> ipage = contractNotMapper.selectNots(
|
IPage<NotRespVO> ipage = contractNotMapper.selectNots(
|
||||||
new Page<NotRespVO>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
|
new Page<NotRespVO>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
|
||||||
@@ -1215,6 +1220,11 @@ public class ContractServiceImpl implements ContractService {
|
|||||||
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
|
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 未查询到相关合同
|
||||||
|
if (CollectionUtils.isEmpty(contractIds)) {
|
||||||
|
return new PageResult<>();
|
||||||
|
}
|
||||||
|
|
||||||
// 分页查询
|
// 分页查询
|
||||||
IPage<DemoteRespVO> ipage = contractDemoteMapper.selectDemotes(
|
IPage<DemoteRespVO> ipage = contractDemoteMapper.selectDemotes(
|
||||||
new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
|
new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
|
||||||
@@ -1237,6 +1247,11 @@ public class ContractServiceImpl implements ContractService {
|
|||||||
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
|
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 未查询到相关合同
|
||||||
|
if (CollectionUtils.isEmpty(contractIds)) {
|
||||||
|
return new PageResult<>();
|
||||||
|
}
|
||||||
|
|
||||||
// 分页查询
|
// 分页查询
|
||||||
IPage<FormulaRespVO> ipage = contractFormulaMapper.selectFormulas(
|
IPage<FormulaRespVO> ipage = contractFormulaMapper.selectFormulas(
|
||||||
new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
|
new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
|
||||||
|
|||||||
Reference in New Issue
Block a user