From f892002a22d5cc1f09d764c20b812d81a519135a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 10:00:39 +0800
Subject: [PATCH] 优化查询列表

---
 Weben_CMS专用代码生成器/Code/Utility/ListHelper.cs |  171 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 106 insertions(+), 65 deletions(-)

diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
index a3bac9e..6758b4b 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
@@ -23,18 +23,73 @@
             for (int i = 0; i < columnNameList.Count; i++)
             {
                 columnModel = columnNameList[i];
-                if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+                if (
+                    columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()
+
+
                     || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+                    || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
+                    )
+                {
+                    continue;
+                }
+                newList.Add(columnModel);
+            }
+            return newList;
+        }
+
+        #endregion
+
+        #region 銆愰〉闈€�戝垪琛ㄧ晫闈�
+
+        /// <summary>
+        /// 椤甸潰琛ㄦ牸灞曠ず鐨� 瀛楁鍒楄〃
+        /// </summary>
+        /// <param name="columnNameList"></param>
+        /// <returns></returns>
+        public static List<ColumnModel> RemoveForPageTableListQueryAttributes(List<ColumnModel> columnNameList)
+        {
+            List<ColumnModel> newList = new List<ColumnModel>();
+            ColumnModel columnModel = null;
+            for (int i = 0; i < columnNameList.Count; i++)
+            {
+                columnModel = columnNameList[i];
+                if (
+                    columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
+                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
+                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()
+
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+                    || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
 
                     )
                 {
@@ -46,6 +101,53 @@
         }
 
         #endregion
+
+        #region 銆愰〉闈€�戦珮绾ф煡璇㈡樉绀虹殑鍒�
+
+        /// <summary>
+        /// 銆愰〉闈€�戦珮绾ф煡璇㈡樉绀虹殑鍒�
+        /// </summary>
+        /// <param name="columnNameList"></param>
+        /// <returns></returns>
+        public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)
+        {
+            List<ColumnModel> newList = new List<ColumnModel>();
+            ColumnModel columnModel = null;
+            for (int i = 0; i < columnNameList.Count; i++)
+            {
+                columnModel = columnNameList[i];
+                if (
+                     columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
+                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
+                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()
+
+
+                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+                    || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
+                    )
+                {
+                    continue;
+                }
+                newList.Add(columnModel);
+            }
+            return newList;
+        }
+
+        #endregion
+
         /// <summary>
         /// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 creator鍜宑reateTime)
         /// </summary>
@@ -213,41 +315,7 @@
         }
 
 
-        /// <summary>
-        /// 椤甸潰琛ㄦ牸灞曠ず鐨� 瀛楁鍒楄〃
-        /// </summary>
-        /// <param name="columnNameList"></param>
-        /// <returns></returns>
-        public static List<ColumnModel> RemoveForPageTableListQueryAttributes(List<ColumnModel> columnNameList)
-        {
-            List<ColumnModel> newList = new List<ColumnModel>();
-            ColumnModel columnModel = null;
-            for (int i = 0; i < columnNameList.Count; i++)
-            {
-                columnModel = columnNameList[i];
-                if (
-                    columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
-                    // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_IsDisabled.ToUpper()
-                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
 
-                    )
-                {
-                    continue;
-                }
-                newList.Add(columnModel);
-            }
-            return newList;
-        }
 
         /// <summary>
         /// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 Id锛孋reateId锛孧odifyId)
@@ -387,34 +455,7 @@
         }
 
 
-
-        public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)
-        {
-            List<ColumnModel> newList = new List<ColumnModel>();
-            ColumnModel columnModel = null;
-            for (int i = 0; i < columnNameList.Count; i++)
-            {
-                columnModel = columnNameList[i];
-                if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
-                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
-
-                    )
-                {
-                    continue;
-                }
-                newList.Add(columnModel);
-            }
-            return newList;
-        }
+       
 
         /// <summary>
         /// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 ID)

--
Gitblit v1.9.3