From 80ef98f15c5652582b5eefb25e1234192b446ae4 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Thu, 23 Oct 2025 14:05:26 +0800 Subject: [PATCH] 2134 --- .../Controllers/Api/ApproveController.cs | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs index a0826a4..a458d68 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs @@ -664,24 +664,21 @@ //filter.IgnoreDataRule = true; //result = GetEntity(e => !e.IS_DELETED, filter, null); - //前端处理Tenant + //前端处理了Tenant filter.IgnoreOrgRule = true; filter.OrgId = null; - result = GetEntity(e => !e.IS_DELETED, filter, null); } - else + + result = GetEntity(null, filter, null); + if (result != null) { - result = GetEntity(null, filter, null); - if (result != null) + if (result.APPROVE_TEMP_ID != null) { - if (result.APPROVE_TEMP_ID != null) - { - var approveTemp = this.GetEntity(t => t.ID == result.APPROVE_TEMP_ID); - if (approveTemp != null) - result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE; - } - result.Nav_ApproveDetails = result.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.MODIFY_TIME).ToList(); + var approveTemp = this.GetEntity(t => t.ID == result.APPROVE_TEMP_ID); + if (approveTemp != null) + result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE; } + result.Nav_ApproveDetails = result.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.MODIFY_TIME).ToList(); } return result; });