From 90dff2ed97466de9e23a15606e24ba37af17d4bb Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 11 Jun 2024 15:24:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=8F=E8=AE=AE=E7=B1=BB=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=EF=BC=8C=E6=8B=93=E5=B1=95=E9=94=99=E8=AF=AF=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tbs/service/impl/TbsCostApplyServiceImpl.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
index a88f51eb..07d69a7e 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
@@ -701,11 +701,13 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             flowId = flowId.substring(0,40);
         }
         // 协议类发起
-        if(newWay && tbsCostApply.getContractFlag().equals(1)){
+        if(tbsCostApply.getContractFlag().equals(1)){
             if(flowIdResult.getMsg()!=null && flowIdResult.getMsg().length()>45){
                 log.error(flowIdResult.getMsg());
                 JSONObject object = JSON.parseObject(flowIdResult.getMsg());
-                Assert.throwEx("流程发起被拦截了");
+                if(!object.get("code").toString().equals("0")){
+                    Assert.throwEx("流程发起被拦截了");
+                }
             }
         }
         String formId = null;
@@ -925,7 +927,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         data.put("cmsLink",baseJumpUrl);
 
         data.put("rowDate",DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME));
-        data.put("rowState","03");
+        //初始化00
+        data.put("rowState","00");
 
         //拓展添加审批关联区域
         String saleRegionId = supplier.handleSaleRegionId();