wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from 2023-03-14

Browse Source
This commit is contained in:
潘飞
2023-03-24 09:37:07 +08:00
parent f95ef4cf73
commit 3de92dab06
57 changed files with 1538 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/Tnb.WorkFlow/Repository/FlowTaskRepository.cs
View File

@@ -220,7 +220,8 @@ public class FlowTaskRepository : IFlowTaskRepository, ITransient
flowUrgent = a.FlowUrgent,
startTime = a.CreatorTime,
completion = a.Completion,
nodeName = b.NodeName
nodeName = b.NodeName,
templateId = a.TemplateId,
});
// 委托审核
@@ -251,7 +252,8 @@ public class FlowTaskRepository : IFlowTaskRepository, ITransient
flowUrgent = a.FlowUrgent,
startTime = a.CreatorTime,
completion = a.Completion,
nodeName = b.NodeName
nodeName = b.NodeName,
templateId = a.TemplateId,
});
var output = await _repository.AsSugarClient().UnionAll(list1, list2).Where(whereLambda).MergeTable().OrderBy(x => x.creatorTime, OrderByType.Desc).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<FlowBeforeListOutput>.SqlSugarPageResult(output);