From a9b3a633dc873ce76570f064f20155c94e8285b8 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: Thu, 9 Oct 2025 18:02:13 +0800
Subject: [PATCH] 1

---
 .../Controllers/Api/EnterpriseLibraryController.cs  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
index 97a105d..612cbb0 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
@@ -2357,7 +2357,7 @@ namespace APT.SK.WebApi.Controllers.Api
             List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> detailContents = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
             var checkTypeIds = this.GetEntities<T_SK_CHECK_TYPE>(t => t.NAME == "岗位排查", new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
             var users = this.GetEntities<T_FM_USER>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Person").ToList();
-            var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area").ToList();
+            var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_ProductionUnit").ToList();
             var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
             var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
             var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList();
@@ -2387,7 +2387,8 @@ namespace APT.SK.WebApi.Controllers.Api
                                     {
                                         T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
                                         de.POST_NAME = post?.NAME;
-                                        de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
+                                        de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
+                                        de.MINE_NAME = item.Nav_ProductionUnit?.NAME;
                                         de.AREA_NAME = item.Nav_Area?.NAME;
                                         de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
                                         de.ENTERPRISE_LIBRARY_ID = item.ID;
@@ -2406,7 +2407,8 @@ namespace APT.SK.WebApi.Controllers.Api
                             {
                                 T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
                                 de.POST_NAME = "未配置辨识岗位";
-                                de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
+                                de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
+                                de.MINE_NAME = item.Nav_ProductionUnit?.NAME;
                                 de.AREA_NAME = item.Nav_Area?.NAME;
                                 de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
                                 de.ENTERPRISE_LIBRARY_ID = item.ID;
@@ -2459,11 +2461,12 @@ namespace APT.SK.WebApi.Controllers.Api
                         }
                     }
                 }
-                var group = detailContents.GroupBy(t => new { t.PRODUCTION_UNIT_ID, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME }).ToList();
+                var group = detailContents.GroupBy(t => new { t.PRODUCTION_UNIT_ID, t.MINE_NAME,t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME }).ToList();
                 foreach (var item in group)
                 {
                     CheckListNew listNew = new CheckListNew();
-                    listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
+                    listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
+                    listNew.MineType = item.Key.MINE_NAME;
                     listNew.CheckType = item.Key.TYPE_NAME;
                     listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
                     listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription();