审批排序
This commit is contained in:
parent
a06f5e4496
commit
8ad73e5bae
@ -962,8 +962,18 @@
|
||||
baseFilter.IgnoreOrgRule = true;
|
||||
baseFilter.OrgId = null;
|
||||
var dbApprove = this.GetEntities<T_PF_APPROVE>(expression, baseFilter, new string[] { "Nav_ApproveDetails.Nav_ApproveUser", "Nav_ApproveDetails.Nav_ApproveRole" }).OrderByDescending(t => t.CREATE_TIME).ToList();
|
||||
if (!dbApprove.Any())
|
||||
if (dbApprove==null || !dbApprove.Any())
|
||||
return null;
|
||||
if (dbApprove.Any())
|
||||
{
|
||||
foreach (var item in dbApprove)
|
||||
{
|
||||
if (item.Nav_ApproveDetails != null && item.Nav_ApproveDetails.Any())
|
||||
{
|
||||
item.Nav_ApproveDetails = item.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.Nav_ApproveRole?.CODE).ThenBy(n=>n.NODE_APPROVE_TIME).ToList();
|
||||
}
|
||||
}
|
||||
}
|
||||
return dbApprove;
|
||||
});
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user