From 2e39825b5c745697c192b67acc9e2caaac6b4709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 2 Jun 2023 20:09:20 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E7=A7=BB=E9=99=A4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=B8=8D=E5=B8=B8=E7=94=A8=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Repository/BaseRepository.cs  | 61 +++++++++++---------------------
 ZR.Repository/IBaseRepository.cs |  6 ----
 2 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs
index 36a8559..bba484f 100644
--- a/ZR.Repository/BaseRepository.cs
+++ b/ZR.Repository/BaseRepository.cs
@@ -12,7 +12,7 @@ using ZR.Model;
 namespace ZR.Repository
 {
     /// <summary>
-    /// 
+    /// 数据仓库类
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public class BaseRepository<T> : SimpleClient<T> where T : class, new()
@@ -79,7 +79,7 @@ namespace ZR.Repository
 
         /// <summary>
         /// 实体根据主键更新指定字段
-        /// return Update(user, t => new { t.NickName, }, true);
+        /// return Update(new SysUser(){ Status = 1 }, t => new { t.NickName, }, true);
         /// </summary>
         /// <param name="entity"></param>
         /// <param name="expression"></param>
@@ -91,12 +91,12 @@ namespace ZR.Repository
         }
 
         /// <summary>
-        /// 根据指定条件更新指定列 eg：Update(new SysUser(){ }, it => new { it.Status }, f => f.Userid == 1));
+        /// 根据指定条件更新指定列 eg：Update(new SysUser(){ Status = 1 }, it => new { it.Status }, f => f.Userid == 1));
         /// 只更新Status列，条件是包含
         /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="expression"></param>
-        /// <param name="where"></param>
+        /// <param name="entity">实体类</param>
+        /// <param name="expression">要更新列的表达式</param>
+        /// <param name="where">where表达式</param>
         /// <returns></returns>
         public int Update(T entity, Expression<Func<T, object>> expression, Expression<Func<T, bool>> where)
         {
@@ -117,14 +117,11 @@ namespace ZR.Repository
         /// <returns></returns>
         public int Update(T entity, List<string> list = null, bool isNull = true)
         {
-            if (list == null)
-            {
-                list = new List<string>()
+            list ??= new List<string>()
             {
                 "Create_By",
                 "Create_time"
             };
-            }
             return Context.Updateable(entity).IgnoreColumns(isNull).IgnoreColumns(list.ToArray()).ExecuteCommand();
         }
 
@@ -239,36 +236,6 @@ namespace ZR.Repository
             return Context.Queryable<T>();
         }
 
-        public (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, int pageIndex = 0, int pageSize = 10)
-        {
-            int totalNumber = 0;
-            var list = Context.Queryable<T>().Where(expression).ToPageList(pageIndex, pageSize, ref totalNumber);
-            return (list, totalNumber);
-        }
-
-        public (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, string order, int pageIndex = 0, int pageSize = 10)
-        {
-            int totalNumber = 0;
-            var list = Context.Queryable<T>().Where(expression).OrderBy(order).ToPageList(pageIndex, pageSize, ref totalNumber);
-            return (list, totalNumber);
-        }
-
-        public (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, Expression<Func<T, object>> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10)
-        {
-            int totalNumber = 0;
-
-            if (orderBy.Equals("DESC", StringComparison.OrdinalIgnoreCase))
-            {
-                var list = Context.Queryable<T>().Where(expression).OrderBy(orderFiled, OrderByType.Desc).ToPageList(pageIndex, pageSize, ref totalNumber);
-                return (list, totalNumber);
-            }
-            else
-            {
-                var list = Context.Queryable<T>().Where(expression).OrderBy(orderFiled, OrderByType.Asc).ToPageList(pageIndex, pageSize, ref totalNumber);
-                return (list, totalNumber);
-            }
-        }
-
         public List<T> SqlQueryToList(string sql, object obj = null)
         {
             return Context.Ado.SqlQuery<T>(sql, obj);
@@ -296,9 +263,21 @@ namespace ZR.Repository
             return source.ToPage(parm);
         }
 
+        /// <summary>
+        /// 分页获取数据
+        /// </summary>
+        /// <param name="where">条件表达式</param>
+        /// <param name="parm"></param>
+        /// <param name="order"></param>
+        /// <param name="orderEnum"></param>
+        /// <returns></returns>
         public PagedInfo<T> GetPages(Expression<Func<T, bool>> where, PagerInfo parm, Expression<Func<T, object>> order, OrderByType orderEnum = OrderByType.Asc)
         {
-            var source = Context.Queryable<T>().Where(where).OrderByIF(orderEnum == OrderByType.Asc, order, OrderByType.Asc).OrderByIF(orderEnum == OrderByType.Desc, order, OrderByType.Desc);
+            var source = Context
+                .Queryable<T>()
+                .Where(where)
+                .OrderByIF(orderEnum == OrderByType.Asc, order, OrderByType.Asc)
+                .OrderByIF(orderEnum == OrderByType.Desc, order, OrderByType.Desc);
 
             return source.ToPage(parm);
         }
diff --git a/ZR.Repository/IBaseRepository.cs b/ZR.Repository/IBaseRepository.cs
index 640612f..a1b4f66 100644
--- a/ZR.Repository/IBaseRepository.cs
+++ b/ZR.Repository/IBaseRepository.cs
@@ -71,12 +71,6 @@ namespace ZR.Repository
         ISugarQueryable<T> Queryable();
         List<T> GetAll(bool useCache = false, int cacheSecond = 3600);
 
-        (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, int pageIndex = 0, int pageSize = 10);
-
-        (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, string order, int pageIndex = 0, int pageSize = 10);
-
-        (List<T>, int) QueryableToPage(Expression<Func<T, bool>> expression, Expression<Func<T, object>> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10);
-
         List<T> SqlQueryToList(string sql, object obj = null);
 
         T GetId(object pkValue);