From 825a1838186e9dbd35ef3091b2c9c786aab451e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Tue, 16 Jun 2026 09:22:36 +0800
Subject: [PATCH] 1

---
 .../Api/EnterpriseLibraryController.cs        | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
index 45f9bbe..9efe3ca 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
@@ -664,6 +664,7 @@ namespace APT.SK.WebApi.Controllers.Api
         [HttpPost, Route("SKOrderPaged")]
         public PagedActionResult<T_SK_ENTERPRISE_LIBRARY> SKOrderPaged([FromBody] KeywordPageFilter pageFilter)
         {
+            var result = new PagedActionResult<T_SK_ENTERPRISE_LIBRARY>();
             var mintype = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "MineType");
             if (mintype != null && mintype.Value.ToString() == "0")
                 pageFilter.FilterGroup.Rules.Remove(mintype);
@@ -672,18 +673,30 @@ namespace APT.SK.WebApi.Controllers.Api
             {
                 nullRules.ForEach(t => pageFilter.FilterGroup.Rules.Remove(t));
             }
-            pageFilter.Include.Add("Nav_RiskName");
-            pageFilter.Include.Add("Nav_Details");
+            //pageFilter.Include.Add("Nav_RiskName");
+            //pageFilter.Include.Add("Nav_Details");
             pageFilter.Include.Add("Nav_ProductionUnit");
-            pageFilter.Include.Add("Nav_Posts");
+            //pageFilter.Include.Add("Nav_Posts");
             pageFilter.SelectField.Add("Nav_ProductionUnit.NAME");
-            pageFilter.SelectField.Add("Nav_Details.NUM");
-            pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");
+            //pageFilter.SelectField.Add("Nav_Details.NUM");
+            //pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");
             var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person");
             var userPosts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(pageFilter.OrgId));
             var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId));
-            var result = this.GetOrderPageEntities<T_SK_ENTERPRISE_LIBRARY>(null, pageFilter);
+            var lib = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0, pageFilter);
+            var libDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId));
+            var libPosts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId));
+            //var result = this.GetOrderPageEntities<T_SK_ENTERPRISE_LIBRARY>(null, pageFilter);
             //var result = WitOrderPaged(null, pageFilter);
+            if (lib != null && lib.Any())
+            {
+                foreach (var item in lib)
+                {
+                    item.Nav_Details = libDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == item.ID).ToList();
+                    item.Nav_Posts = libPosts.Where(t => t.ENTERPRISE_LIBRARY_ID == item.ID).ToList();
+                }
+                result.Data = lib;
+            }
             if (result != null && result.Data != null)
             {
                 if (result.Data != null && result.Data.Any())