mirror of
https://gitee.com/dotnetchina/OpenAuth.Net.git
synced 2026-06-23 00:52:07 +08:00
🐛fix: 修复加签
This commit is contained in:
@@ -103,22 +103,23 @@ namespace OpenAuth.App
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public FlowApprover[] GetApprovers(QueryApproverReq req)
|
public FlowApprover[] GetApprovers(QueryApproverReq req)
|
||||||
{
|
{
|
||||||
var query= Repository.AsQueryable()
|
// 一次查询,内存中处理,避免 ISugarQueryable 状态污染
|
||||||
|
var all = Repository.AsQueryable()
|
||||||
.Where(u => u.InstanceId == req.FlowInstanceId
|
.Where(u => u.InstanceId == req.FlowInstanceId
|
||||||
&& u.ActivityId == req.ActivityId && u.Status == 0); //本节点待审批的加签人
|
&& u.ActivityId == req.ActivityId && u.Status == 0)
|
||||||
if (query.Count() == 0)
|
.OrderBy(u => u.OrderNo)
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
if (all.Length == 0) return null;
|
||||||
|
|
||||||
|
// 顺序执行:只返回第一个
|
||||||
|
if (all[0].ApproveType == Define.APPROVE_TYPE_SEQUENTIAL)
|
||||||
{
|
{
|
||||||
return null;
|
return new[] { all[0] };
|
||||||
}
|
}
|
||||||
|
|
||||||
//如果是顺序执行,取第一个人
|
// 并行且/并行或:返回全部
|
||||||
if (query.First().ApproveType == Define.APPROVE_TYPE_SEQUENTIAL)
|
return all;
|
||||||
{
|
|
||||||
var result = query.OrderBy(u => u.OrderNo).First();
|
|
||||||
return new[] { result };
|
|
||||||
}
|
|
||||||
//否则并行且/并行或都是返回所有加签人
|
|
||||||
return query.ToArray();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user