From 91a6242ed074ddeece06106924aca851c91346e9 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Mon, 13 Sep 2021 09:55:13 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-59143=20=E3=80=90=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E9=80=82=E9=85=8D=E3=80=91=E6=A8=A1=E7=89=88=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E4=B9=9F=E8=A6=81=E6=94=AF=E6=8C=81=E6=96=B0=E6=97=A7=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/fit/common/TemplateTool.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java b/designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java
index ae1e98f88..cb415df59 100644
--- a/designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java
+++ b/designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java
@@ -45,10 +45,8 @@ public class TemplateTool {
             JFormType currentType = JFormType.OLD_TYPE;
             if (AdaptiveSwitchUtil.isSwitchJFromIng()) {
                 currentType = DesignerUIModeConfig.getInstance().newUIMode() ? JFormType.NEW_TYPE : JFormType.OLD_TYPE;
-            } else {
-                if (isNewJForm(jTemplate)) {
-                    currentType = JFormType.NEW_TYPE;
-                }
+            } else if (isNewJForm(jTemplate)) {
+                currentType = JFormType.NEW_TYPE;
             }
             //UI转换
             currentType.switchUIMode();