From 5f6051a28319f4cc85968a2c2045b83478bd9f44 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Tue, 17 Dec 2024 10:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E4=BA=BA=E5=8A=9B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=B0=E5=A2=9E=20Excel=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Services/BASE/BaseServices.cs             |  1 +
 .../Ghrh/Ghrh_YearHumanSettingsServices.cs            | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs
index 32ba0bf6..3de3de51 100644
--- a/Tiobon.Core.Services/BASE/BaseServices.cs
+++ b/Tiobon.Core.Services/BASE/BaseServices.cs
@@ -786,6 +786,7 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
     {
         QueryBody filter = new QueryBody();
         filter.pageNum = 1;
+        filter.jsonParam = body.jsonParam;
         filter.pageSize = 1000000;
         filter.langId = body.langId;
 
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs
index 87b7b95b..1029e16c 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs
@@ -524,7 +524,9 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
         QueryBody filter = new QueryBody();
         filter.pageNum = 1;
         filter.pageSize = 1000000;
+        filter.jsonParam = body.jsonParam;
         filter.langId = body.langId;
+        filter.menuName = body.menuName;
 
         var condition = "1=1";
         if (body.exportSet.SelectRowKeys != null && body.exportSet.SelectRowKeys.Any())
@@ -532,14 +534,7 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
 
         var data = await QueryFilterPage(filter, condition, true);
 
-        string sql = $@"SELECT *
-                            FROM Ghrs_PageSettingQuery
-                            WHERE     IsEnable = 1
-                                  AND PageNo = '{body.menuName}'
-                                  AND (defaultHidden = 'false' OR defaultHidden is null)
-                            ORDER BY SortNo ASC";
-
-        var columns = DbAccess.QueryList<QueryExportColumn>(sql);
+        var columns = data.result.JM_TableColumnT1.TableColumn;
 
         var fieldDescs = new Dictionary<string, string>();
         if (body.exportSet.ExFields.Any())