SZHGYL-289修改

This commit is contained in:
guojunyun
2025-11-20 15:23:37 +08:00
parent b2c7ca399a
commit 584998b129

View File

@@ -1191,12 +1191,12 @@ public class ContractServiceImpl implements ContractService {
if (StringUtils.isNotEmpty(queryReqVO.getContractName()) if (StringUtils.isNotEmpty(queryReqVO.getContractName())
|| StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) {
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
}
// 未查询到相关合同 // 未查询到相关合同
if (CollectionUtils.isEmpty(contractIds)) { if (CollectionUtils.isEmpty(contractIds)) {
return new PageResult<>(); return new PageResult<>();
} }
}
// 分页查询 // 分页查询
IPage<NotRespVO> ipage = contractNotMapper.selectNots( IPage<NotRespVO> ipage = contractNotMapper.selectNots(
@@ -1218,12 +1218,12 @@ public class ContractServiceImpl implements ContractService {
List<Long> contractIds = new ArrayList<>(); List<Long> contractIds = new ArrayList<>();
if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) {
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
}
// 未查询到相关合同 // 未查询到相关合同
if (CollectionUtils.isEmpty(contractIds)) { if (CollectionUtils.isEmpty(contractIds)) {
return new PageResult<>(); return new PageResult<>();
} }
}
// 分页查询 // 分页查询
IPage<DemoteRespVO> ipage = contractDemoteMapper.selectDemotes( IPage<DemoteRespVO> ipage = contractDemoteMapper.selectDemotes(
@@ -1245,12 +1245,12 @@ public class ContractServiceImpl implements ContractService {
List<Long> contractIds = new ArrayList<>(); List<Long> contractIds = new ArrayList<>();
if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) {
contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber());
}
// 未查询到相关合同 // 未查询到相关合同
if (CollectionUtils.isEmpty(contractIds)) { if (CollectionUtils.isEmpty(contractIds)) {
return new PageResult<>(); return new PageResult<>();
} }
}
// 分页查询 // 分页查询
IPage<FormulaRespVO> ipage = contractFormulaMapper.selectFormulas( IPage<FormulaRespVO> ipage = contractFormulaMapper.selectFormulas(