From 65302c1e35aa23372efcbf346452da936c2a9b5e Mon Sep 17 00:00:00 2001
From: xiaxl <Jjkj_2020>
Date: Thu, 23 Jun 2022 10:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E9=A2=84=E7=BD=AEli?=
 =?UTF-8?q?st=E6=A8=A1=E6=9D=BF=E5=BE=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/template/model_list1.ftl   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl
index 93a747d..bcba6d5 100644
--- a/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl
+++ b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl
@@ -90,8 +90,9 @@
                                                 "dataset": "${param.queryDs}"
                                             },
                                             "id": "id${newId()}"
-                                        },
-                                        {
+                                        }
+                                        <#if (group.sfilters?size>0)>
+                                        ,{
                                             "type": "fx-button",
                                             "props": {
                                                 "label": "高级筛选",
@@ -103,6 +104,7 @@
                                             },
                                             "id": "id${newId()}"
                                         }
+                                        </#if>
                                     ]
                                 },
                                 "layout": {
@@ -279,8 +281,9 @@
                 },
                 "events": {
                 }
-            },
-            "graph": {
+            }
+    <#if (group.sfilters?size>0)>
+        ,"graph": {
                 "shape": "panel",
                 "id": "root_panel",
                 "type": "fx-split-panel",
@@ -302,7 +305,7 @@
                             "scroll": true
                         },
                         "children": [
-                                <#if (group.sfilters?size>0)>
+
                                     <#assign fields = group.sfilters>
                                     <#list fields as filter>
                                         {
@@ -324,7 +327,7 @@
                                         }
                                         <#if filter_has_next>,</#if>
                                     </#list>
-                                </#if>
+
                         ]
                     },
                     {
@@ -372,6 +375,7 @@
                     }
                 ]
             }
+    </#if>
         }
     ],
 </#list>