diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index aff1ba349..5ddfbb31d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -192,10 +192,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { } try { - // 如果是补录,启动审批流 - if(record.getMerchantId() != null && record.getFlowParams() != null){ + // 启动审批流 + if(record.getFlowParams() != null){ record.getFlowParams().put("businessId",record.getId().toString()); - record.getFlowParams().put("supplement",true); + if(record.getMerchantId() != null) { + record.getFlowParams().put("supplement", true); //设置补录 + } wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); // 合同状态改成待签约 @@ -648,7 +650,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.error("deleteProcessInstance error",e); } } - } //把状态为意见而商户未关联的数据改为待签约状态 @@ -807,9 +808,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { public ResultData updateFile(WxRentContract record, Long userId,String userName) { ResultData resultData = getResultDataForUpdate(record, userId); try { + // 启动审批流 if(record.getFlowParams() != null){ record.getFlowParams().put("businessId",record.getId().toString()); - record.getFlowParams().put("supplement",false); + if(record.getMerchantId() != null) { + record.getFlowParams().put("supplement", true); //设置补录 + } wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); // 合同状态改成待签约