From 3013e3f394696b140a070dd6bf40df25f1d544d3 Mon Sep 17 00:00:00 2001
From: lip <lip@jujiatech.com>
Date: Thu, 29 Sep 2022 14:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A8=A1=E5=9E=8B=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BABUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/default/incModel/inc_list_dialog.ftl    | 20 +++++++++++++++++---
 .../template/default/incModel/inc_list_query.ftl     | 16 +++++++++++++++-
 .../template/default/incModel/inc_query_sfilters.ftl | 20 +++++++++++++++++---
 .../static/template/default/model_card_flow.ftl      | 16 +++++++++++++++-
 4 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_dialog.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_dialog.ftl
index b48748e..1985f26 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_dialog.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_dialog.ftl
@@ -25,9 +25,23 @@
         "required": "${dfield.required}",
         <#if dfield.lookup??>
             "lookup": {
-                <#list dfield.lookup as k, v>
-                    "${k}": "${v}" <#if  k_has_next>,</#if>
-                </#list>
+            <#list dfield.lookup as k, v>
+                <#if v?is_enumerable>
+                    "${k}": [
+                    <#list v as v1>
+                        {
+                        <#list v1 as vk1, vv1>
+                            "${vk1}": "${vv1}"<#if vk1_has_next>,</#if>
+                        </#list>
+                        }
+                        <#if v1_has_next>,</#if>
+                    </#list>
+                    ]
+                <#else>
+                    "${k}": "${v}"
+                </#if>
+                <#if k_has_next>,</#if>
+            </#list>
              },
         </#if>
         <#if dfield.maxlength gt 0>
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl
index a2053a2..1275371 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl
@@ -33,7 +33,21 @@
             <#if filter.lookup??>
                 "lookup": {
                 <#list filter.lookup as k, v>
-                    "${k}": "${v}" <#if  k_has_next>,</#if>
+                    <#if v?is_enumerable>
+                        "${k}": [
+                        <#list v as v1>
+                            {
+                            <#list v1 as vk1, vv1>
+                                "${vk1}": "${vv1}"<#if vk1_has_next>,</#if>
+                            </#list>
+                            }
+                            <#if v1_has_next>,</#if>
+                        </#list>
+                        ]
+                    <#else>
+                        "${k}": "${v}"
+                    </#if>
+                    <#if k_has_next>,</#if>
                 </#list>
                 },
             </#if>
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl
index 2af9c8e..4d2316e 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl
@@ -59,9 +59,23 @@
                         "field": "${filter.id}",
                        <#if filter.lookup??>
                         "lookup": {
-                          <#list filter.lookup as k, v>
-                            "${k}": "${v}" <#if  k_has_next>,</#if>
-                          </#list>
+                           <#list filter.lookup as k, v>
+                               <#if v?is_enumerable>
+                                   "${k}": [
+                                   <#list v as v1>
+                                       {
+                                       <#list v1 as vk1, vv1>
+                                           "${vk1}": "${vv1}"<#if vk1_has_next>,</#if>
+                                       </#list>
+                                       }
+                                       <#if v1_has_next>,</#if>
+                                   </#list>
+                                   ]
+                               <#else>
+                                   "${k}": "${v}"
+                               </#if>
+                               <#if k_has_next>,</#if>
+                           </#list>
                         },
                         </#if>
                         "name": "${filter.name}"
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl
index 2c03eb0..f1b3eef 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl
@@ -307,7 +307,21 @@
                       <#if fields.lookup??>
                       "lookup": {
                         <#list fields.lookup as k, v>
-                        "${k}": "${v}" <#if  k_has_next>,</#if>
+                          <#if v?is_enumerable>
+                            "${k}": [
+                            <#list v as v1>
+                              {
+                              <#list v1 as vk1, vv1>
+                                "${vk1}": "${vv1}"<#if vk1_has_next>,</#if>
+                              </#list>
+                              }
+                              <#if v1_has_next>,</#if>
+                            </#list>
+                            ]
+                          <#else>
+                            "${k}": "${v}"
+                          </#if>
+                          <#if k_has_next>,</#if>
                         </#list>
                       },
                       </#if>