年度人力配置新增 Excel导出

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;
 

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())