diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs index 81eaa0a..a0a8944 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs @@ -962,8 +962,18 @@ baseFilter.IgnoreOrgRule = true; baseFilter.OrgId = null; var dbApprove = this.GetEntities(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; }); }