From c4bc95b2d6b8b587fa1515ad123d9c963226f07d Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Wed, 12 Jun 2024 12:03:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 visualdev/Tnb.VisualDev/RunService.cs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/visualdev/Tnb.VisualDev/RunService.cs b/visualdev/Tnb.VisualDev/RunService.cs
index 59bc6a60..a89628f1 100644
--- a/visualdev/Tnb.VisualDev/RunService.cs
+++ b/visualdev/Tnb.VisualDev/RunService.cs
@@ -27,6 +27,7 @@ using JNPF.WorkFlow.Interfaces.Repository;
 using Mapster;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SqlSugar;
 
@@ -373,6 +374,24 @@ public class RunService : IRunService, ITransient
         string? queryJson = input.queryJson;
         input.queryJson = string.Empty;
 
+        //modify by zhoukeda 20240612 关联表单查询优化 开始
+        if (queryJson.IsNotEmptyOrNull())
+        {
+            Dictionary<string, string>? search = queryJson.ToObject<Dictionary<string, string>>();
+            List<IConditionalModel> conditionalModels = new List<IConditionalModel>(); 
+            foreach (var item in search)
+            {
+                conditionalModels.Add(new ConditionalModel()
+                {
+                    FieldName = item.Key,
+                    FieldValue = item.Value,
+                    ConditionalType = ConditionalType.Like
+                });
+            }
+
+            input.queryJson = JsonConvert.SerializeObject(conditionalModels);
+        }
+        //modify by zhoukeda 20240612 关联表单查询优化 结束
         realList = _databaseService.GetInterFaceData(link, sql, input, templateInfo.ColumnData.Adapt<MainBeltViceQueryModel>(), pvalue, tableFieldKeyValue);
         input.queryJson = queryJson;