| @@ -295,7 +295,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| } | } | ||||
| if (rentHasValidProperty(contract)) { | if (rentHasValidProperty(contract)) { | ||||
| return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效的物业合同。"); | |||||
| return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效或者审批中的物业合同。"); | |||||
| } | } | ||||
| wxPropertyContractService.updatePropertyContractStatus(proertyContract.getId()); | wxPropertyContractService.updatePropertyContractStatus(proertyContract.getId()); | ||||
| return new ResultData(Result.SUCCESS,"合同生效成功!"); | return new ResultData(Result.SUCCESS,"合同生效成功!"); | ||||
| @@ -329,7 +329,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| } | } | ||||
| if (rentHasValidProperty(contract)) { | if (rentHasValidProperty(contract)) { | ||||
| return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效的物业合同。"); | |||||
| return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效或者审批中的物业合同。"); | |||||
| } | } | ||||
| if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { | if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { | ||||