From 5e54e8769d4a9561eb6d860692fcf8c7d5a645a5 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 2 Jan 2024 18:04:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B5=81=E7=A8=8B=E4=BB=A3=E5=8A=9E=E4=B8=BA?=
 =?UTF-8?q?=E6=B6=88=E9=99=A4=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusProcessNewServiceImpl.java        | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
index fbba1897..f3540da5 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
@@ -272,18 +272,17 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
                  if (StringUtils.isBlank(esIdMesg)) {
                      esIdMesg = jsonObject.getString("nowEsId");
                  }
-                 // 如果依然是null， 可能是表单嵌套问题，需要再次解析
-                 JSONObject form = jsonObject.getJSONObject("form");
-                 if (form!= null) {
-                    esIdMesg = form.getString("esId");
-                    if (StringUtils.isBlank(esIdMesg)) {
-                        esIdMesg = form.getString("nowEsId");
-                    }
-                 } else {
-                     return false;
-                 }
                  if (StringUtils.isBlank(esIdMesg)) {
-                     return false;
+                     // 如果依然是null， 可能是表单嵌套问题，需要再次解析
+                     JSONObject form = jsonObject.getJSONObject("form");
+                     if (form!= null) {
+                         esIdMesg = form.getString("esId");
+                         if (StringUtils.isBlank(esIdMesg)) {
+                             esIdMesg = form.getString("nowEsId");
+                         }
+                     } else {
+                         return false;
+                     }
                  }
                  return esIdMesg.equals(esId);
              }