diff --git a/common.props b/common.props
index 17c7a75a..eb6672a5 100644
--- a/common.props
+++ b/common.props
@@ -4,9 +4,9 @@
$(NoWarn);CS1591;CA1307;CS8625;CS8600;CS8601;CS8604;CS8618;
-
+
\ No newline at end of file
diff --git a/system/Tnb.Systems/System/AdvancedQueryService.cs b/system/Tnb.Systems/System/AdvancedQueryService.cs
index 3e609f21..e1925baa 100644
--- a/system/Tnb.Systems/System/AdvancedQueryService.cs
+++ b/system/Tnb.Systems/System/AdvancedQueryService.cs
@@ -14,9 +14,6 @@ namespace JNPF.Systems;
///
/// 高级查询方案管理
-/// 版 本:V3.4
-/// 版 权:拓通智联科技有限公司(http://www.tuotong-tech.com)
-/// 日 期:2022-06-07.
///
[ApiDescriptionSettings(Tag = "System", Name = "AdvancedQuery", Order = 202)]
[Route("api/system/[controller]")]
diff --git a/visualdev/Tnb.VisualDev.Engine/Core/FormDataParsing.cs b/visualdev/Tnb.VisualDev.Engine/Core/FormDataParsing.cs
index c6be03c3..a76ba438 100644
--- a/visualdev/Tnb.VisualDev.Engine/Core/FormDataParsing.cs
+++ b/visualdev/Tnb.VisualDev.Engine/Core/FormDataParsing.cs
@@ -318,18 +318,7 @@ public class FormDataParsing : ITransient
else conversionData = data;
break;
default:
- //modify by ly on 20230327
- var temp = data.ToString();
- Regex re = new Regex("(?<=\").*?(?=\")", RegexOptions.None);
- if (!re.IsMatch(temp))
- {
- temp = $"\"{data}\"";
- }
- if (!temp.StartsWith("[") && !temp.EndsWith("]"))
- {
- temp = $"[{temp}]";
- }
- conversionData = temp.ToObject>();
+ conversionData = data.ToString().ToObject>();
break;
}
}
diff --git a/visualdev/Tnb.VisualDev.Interfaces/IRunService.cs b/visualdev/Tnb.VisualDev.Interfaces/IRunService.cs
index a186c7d7..0b3f46e1 100644
--- a/visualdev/Tnb.VisualDev.Interfaces/IRunService.cs
+++ b/visualdev/Tnb.VisualDev.Interfaces/IRunService.cs
@@ -147,9 +147,4 @@ public interface IRunService
/// 表单数据.
/// 是否子流程.
Task> SaveDataToDataByFId(string oldFId, string newFId, List> mapRule, Dictionary formData, bool isSubFlow = false);
-
- //Task> GetUpdateSqlByTemplate(TemplateParsingBase templateInfo, VisualDevModelDataUpInput visualdevModelDataUpForm, string id);
-
- //Task>>> GetCreateSqlByTemplate(TemplateParsingBase templateInfo, VisualDevModelDataCrInput dataInput, string mainId);
-
}
diff --git a/workflow/Tnb.WorkFlow/Service/FlowTemplateService.cs b/workflow/Tnb.WorkFlow/Service/FlowTemplateService.cs
index 4fcabe8b..9a2b233e 100644
--- a/workflow/Tnb.WorkFlow/Service/FlowTemplateService.cs
+++ b/workflow/Tnb.WorkFlow/Service/FlowTemplateService.cs
@@ -166,11 +166,11 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
///
/// 请求参数.
///
- [HttpGet("FlowJsonList/{id}")]
+ [HttpGet("{id}/FlowJsonList")]
public async Task GetFlowJsonList(string id, [FromQuery] FlowTemplateListQuery input)
{
var whereLambda = LinqExpression.And();
- whereLambda = whereLambda.And(x => x.DeleteMark == null && x.Id == id);
+ whereLambda = whereLambda.And(x => x.DeleteMark == null && x.TemplateId == id);
var start = new DateTime();
var end = new DateTime();
if (input.endTime != null && input.startTime != null)
@@ -617,7 +617,7 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
await _repository.AsSugarClient().Insertable(visibleList).CallEntityMethod(m => m.Creator()).ExecuteCommandAsync();
#region 功能流程则要回写到对应的表单表中
- GetFormIdList(flowTemplateJson.ToObject>().First().flowTemplateJson, formIdList);
+ GetFormIdList(flowTemplateJson.ToObject(), formIdList);
foreach (var item in formIdList)
{
var formRelationEntity = new FlowFormRelationEntity
@@ -700,7 +700,7 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
}
if (visibleList.Count > 0)
await _repository.AsSugarClient().Insertable(visibleList).CallEntityMethod(m => m.Creator()).ExecuteCommandAsync();
- GetFormIdList(flowTemplateJson.ToObject>().First().flowTemplateJson, formIdList);
+ GetFormIdList(flowTemplateJson.ToObject(), formIdList);
foreach (var item in formIdList)
{
var formRelationEntity = new FlowFormRelationEntity
@@ -739,10 +739,8 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
var output = new List();
if (josnStr.IsNotEmptyOrNull())
{
- // 发起节点属性.
- var flow = josnStr.ToObject>();
- var pro = flow.First().flowTemplateJson.properties.ToObject();
- //var pro = josnStr.ToObject().properties.ToObject();
+ // 发起节点属性.
+ var pro = josnStr.ToObject().properties.ToObject();
if (pro.initiator.Any())
{
var list = pro.initiator.Select(x => new FlowEngineVisibleEntity() { OperatorId = x, OperatorType = "user" }).ToList();