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