From def67ae3909e2dcaf35b0a4221a97f218fca2fb3 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 8 Jan 2021 18:54:32 +0800 Subject: [PATCH] fix bug --- .../controller/contract/WxPropertyContractController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 4ac929c3c..473cdf465 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -295,7 +295,7 @@ public class WxPropertyContractController extends WxContractBaseController { } if (rentHasValidProperty(contract)) { - return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效的物业合同。"); + return new ResultData(Result.ERROR, "租金合同["+contract.getContractNumber()+"]存在有效或者审批中的物业合同。"); } wxPropertyContractService.updatePropertyContractStatus(proertyContract.getId()); return new ResultData(Result.SUCCESS,"合同生效成功!"); @@ -329,7 +329,7 @@ public class WxPropertyContractController extends WxContractBaseController { } 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()) {