From 44df8678ef05e40d087b6ca3966ec9257103395d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 26 Aug 2020 21:26:41 +0800 Subject: [PATCH] fix contract --- .../controller/contract/WxPropertyContractController.java | 4 ++-- .../controller/contract/WxRentContractController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 cf31abc35..e9897ff69 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -237,8 +237,8 @@ public class WxPropertyContractController extends WxContractBaseController { } //查询是否有审批流程 - if(propertyContractHasWorkFlow(contract)) { - return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"租赁合同存在工作流,不允许直接生效。"); + if(!propertyContractHasWorkFlow(contract)) { + return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"物业合同不存在工作流,不能提交审批。"); } if (rentHasValidProperty(contract)) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 1f1444a5d..715c72272 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -488,8 +488,8 @@ public class WxRentContractController extends WxContractBaseController { } MallUserInfo user = getUser(); //查询是否有审批流程 - if(rentContractHasWorkFlow(rentContract)) { - return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"租赁合同存在工作流,不允许直接生效。"); + if(!rentContractHasWorkFlow(rentContract)) { + return new ResultData(ErrorCode.FLOW_FAIL.getCode(),"租赁合同不存在工作流,不能提交审批。"); } try {