Merge remote-tracking branch 'origin/master'

This commit is contained in:
baozhipeng
2021-09-18 17:23:29 +08:00
@@ -859,9 +859,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
public void insertPayIncomeContract(PayIncomeContract payIncomeContract,String projectId,Integer projectType) {
// 合同存在 && 合同状态不为草稿,不为未通过 关联合同
if(!Objects.isNull(payIncomeContract)){
if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS1)){
throw new JeroBootException("合同状态为草稿状态不可关联!");
}
// if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS1)){
// throw new JeroBootException("合同状态为草稿状态不可关联!");
// }
PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
payIncomeContractAssociated.setContractId(payIncomeContract.getId());
payIncomeContractAssociated.setProjectType(projectType);