|
@@ -61,6 +61,7 @@ public class WorkflowController : BaseController
|
|
|
/// <param name="dto"></param>
|
|
|
/// <returns></returns>
|
|
|
[HttpGet("definition")]
|
|
|
+ [AllowAnonymous]
|
|
|
public async Task<PagedDto<DefinitionDto>> QueryDefinitions([FromQuery] PagedRequest dto)
|
|
|
{
|
|
|
//todo 数据量大需重构
|
|
@@ -68,12 +69,13 @@ public class WorkflowController : BaseController
|
|
|
.Where(d => d.Status == EDefinitionStatus.Temporary)
|
|
|
.ToListAsync();
|
|
|
var query2 = await _definitionRepository.Queryable()
|
|
|
+ .Where(d => d.Status != EDefinitionStatus.Temporary)
|
|
|
.Select(d => new { i = SqlFunc.RowNumber($"{d.Version} desc", d.Code), d })
|
|
|
.MergeTable()
|
|
|
.Where(d => d.i == 1)
|
|
|
.ToListAsync();
|
|
|
|
|
|
- var query = query1.Union(query2.Select(d => d.d)).Distinct();
|
|
|
+ var query = query1.Union(query2.Select(d => d.d));
|
|
|
var total = query.Count();
|
|
|
var items = query
|
|
|
.OrderBy(d => d.Status)
|