From 6613fa6f5ad9cd6031571a3f456be04c1ace2dd0 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: Fri, 28 Nov 2025 09:55:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
index 5a0c625..38093ba 100644
--- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
+++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
@@ -796,7 +796,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                             {
                                 var param = ((FMDepartmentType)departmentInfo.DEPARTMENT_TYPE).GetDescription();
                                 var param2 = ((FMDepartmentType)roleInfo.DEPARTMENT_TYPE).GetDescription();
-                                throw new Exception(departmentInfo.NAME + "是" + param + "," + roleInfo.NAME + "是" + param2 + ",组织层级不一致");
+                                //throw new Exception(departmentInfo.NAME + "是" + param + "," + roleInfo.NAME + "是" + param2 + ",组织层级不一致");
                             }
                         }
                     }

From 5472cc1f7f9e03ebb09a6776f38be64434bea0b8 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: Fri, 28 Nov 2025 10:30:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/HiddenDangerRectifyRecordController.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
index 4272f77..965414c 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
@@ -608,7 +608,7 @@ namespace APT.SK.WebApi.Controllers
                 {
                     record.QTY = records.Count(p => p.PRODUCTION_UNIT_ID == record.PRODUCTION_UNIT_ID && p.RISK_AREA_ID == record.RISK_AREA_ID && p.CHECK_CONTENTS_ID == record.CHECK_CONTENTS_ID && p.CHECK_QUESTION_ID == record.CHECK_QUESTION_ID && p.HIDDEN_LEVEL == record.HIDDEN_LEVEL);
                 }
-                var data = groupRecords.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenBy(m => m.RISK_AREA_ID).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList();
+                var data = groupRecords.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenByDescending(m => m.QTY).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList();
                 result.Data = data;
                 result.TotalCount = groupRecords.Count;
             }

From 4723f1a0932ba11f8c3124ec70802a977a77bb13 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: Fri, 28 Nov 2025 10:34:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/HiddenDangerRectifyRecordController.cs       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
index 965414c..a0a77c2 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
@@ -639,6 +639,7 @@ namespace APT.SK.WebApi.Controllers
             ruleLevel.Field = "HIDDEN_LEVEL";
             ruleLevel.Value = entity.HIDDEN_LEVEL;
             pageFilter = new KeywordPageFilter();
+            pageFilter.IgnoreDataRule = true;
             pageFilter.FilterGroup.Rules.Add(ruleArea);
             pageFilter.FilterGroup.Rules.Add(ruleOrg);
             pageFilter.FilterGroup.Rules.Add(ruleContent);