From a4025eb8f10d091bce0fc56474f638c4453c0550 Mon Sep 17 00:00:00 2001
From: Cookies <11@22.com>
Date: Sun, 9 Jun 2024 15:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=9C=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E5=8F=AF=E4=BB=A5=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=88=97=E7=9A=84func?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VOL.Core/BaseProvider/ServiceBase.cs"                  | 4 ++++
 .../VOL.Core/Filters/ServiceFunFilter.cs"                  | 7 ++++++-
 Net6.SqlSugar/VOL.Core/BaseProvider/ServiceBase.cs         | 4 ++++
 Net6.SqlSugar/VOL.Core/Filters/ServiceFunFilter.cs         | 7 ++++++-
 Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs               | 4 ++++
 Vue.Net/VOL.Core/Filters/ServiceFunFilter.cs               | 7 ++++++-
 6 files changed, 30 insertions(+), 3 deletions(-)

diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/ServiceBase.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/ServiceBase.cs"
index 22116c21a..bb60a419b 100644
--- "a/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/ServiceBase.cs"
+++ "b/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/ServiceBase.cs"
@@ -431,6 +431,10 @@ private List<string> GetIgnoreTemplate()
             //忽略创建人、修改人、审核等字段
             List<string> ignoreTemplate = UserIgnoreFields.ToList();
             ignoreTemplate.AddRange(auditFields.ToList());
+            if (IgnoreTemplateExecuting != null)
+            {
+                ignoreTemplate = IgnoreTemplateExecuting.Invoke(ignoreTemplate);
+            }
             return ignoreTemplate;
         }
 
diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ServiceFunFilter.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ServiceFunFilter.cs"
index 35bd0dfd7..0cebcd111 100644
--- "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ServiceFunFilter.cs"
+++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ServiceFunFilter.cs"
@@ -216,7 +216,12 @@ public abstract class ServiceFunFilter<T> where T : class
         /// </summary>
         protected Expression<Func<T, object>> DownLoadTemplateColumns { get; set; }
 
- 
+        /// <summary>
+        /// 导出下载模板，处理排除的资料列, 传入默认排除的列，返回处理后的列
+        /// </summary>
+
+        protected Func<List<string>, List<string>> IgnoreTemplateExecuting;
+
         /// <summary>
         /// 导入保存后
         /// </summary>
diff --git a/Net6.SqlSugar/VOL.Core/BaseProvider/ServiceBase.cs b/Net6.SqlSugar/VOL.Core/BaseProvider/ServiceBase.cs
index 891a65a91..d36eb2642 100644
--- a/Net6.SqlSugar/VOL.Core/BaseProvider/ServiceBase.cs
+++ b/Net6.SqlSugar/VOL.Core/BaseProvider/ServiceBase.cs
@@ -404,6 +404,10 @@ private List<string> GetIgnoreTemplate()
             //忽略创建人、修改人、审核等字段
             List<string> ignoreTemplate = UserIgnoreFields.ToList();
             ignoreTemplate.AddRange(auditFields.ToList());
+            if (IgnoreTemplateExecuting != null)
+            {
+                ignoreTemplate = IgnoreTemplateExecuting.Invoke(ignoreTemplate);
+            }
             return ignoreTemplate;
         }
 
diff --git a/Net6.SqlSugar/VOL.Core/Filters/ServiceFunFilter.cs b/Net6.SqlSugar/VOL.Core/Filters/ServiceFunFilter.cs
index 44f0143fe..ed0b725b0 100644
--- a/Net6.SqlSugar/VOL.Core/Filters/ServiceFunFilter.cs
+++ b/Net6.SqlSugar/VOL.Core/Filters/ServiceFunFilter.cs
@@ -217,7 +217,12 @@ public abstract class ServiceFunFilter<T> where T : class
         /// </summary>
         protected Expression<Func<T, object>> DownLoadTemplateColumns { get; set; }
 
- 
+        /// <summary>
+        /// 导出下载模板，处理排除的资料列, 传入默认排除的列，返回处理后的列
+        /// </summary>
+
+        protected Func<List<string>, List<string>> IgnoreTemplateExecuting;
+
         /// <summary>
         /// 导入保存后
         /// </summary>
diff --git a/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs b/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs
index 1aba8c397..7c15f757c 100644
--- a/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs
+++ b/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs
@@ -430,6 +430,10 @@ private List<string> GetIgnoreTemplate()
             //忽略创建人、修改人、审核等字段
             List<string> ignoreTemplate = UserIgnoreFields.ToList();
             ignoreTemplate.AddRange(auditFields.ToList());
+            if (IgnoreTemplateExecuting != null)
+            {
+                ignoreTemplate = IgnoreTemplateExecuting.Invoke(ignoreTemplate);
+            }
             return ignoreTemplate;
         }
 
diff --git a/Vue.Net/VOL.Core/Filters/ServiceFunFilter.cs b/Vue.Net/VOL.Core/Filters/ServiceFunFilter.cs
index 35bd0dfd7..0cebcd111 100644
--- a/Vue.Net/VOL.Core/Filters/ServiceFunFilter.cs
+++ b/Vue.Net/VOL.Core/Filters/ServiceFunFilter.cs
@@ -216,7 +216,12 @@ public abstract class ServiceFunFilter<T> where T : class
         /// </summary>
         protected Expression<Func<T, object>> DownLoadTemplateColumns { get; set; }
 
- 
+        /// <summary>
+        /// 导出下载模板，处理排除的资料列, 传入默认排除的列，返回处理后的列
+        /// </summary>
+
+        protected Func<List<string>, List<string>> IgnoreTemplateExecuting;
+
         /// <summary>
         /// 导入保存后
         /// </summary>