Merge branch 'master' into wxw

wxw

2024-08-17 0464969366317154fdbb51e106ca778b855bdd08

 Wms/Utility/Extension/SqlSugarPagedExtensions.cs

@@ -6,7 +6,7 @@

namespace Utility
{
    public class SqlSugarPagedList<TEntity> where TEntity : new()
    public class SqlSugarPagedList
    {
        /// <summary>
        /// 总条数
@@ -21,7 +21,7 @@
        /// <summary>
        /// 当前页集合
        /// </summary>
        public IEnumerable<TEntity> Items { get; set; }
        public object Items { get; set; }
    }
    /// <summary>
    /// 分页拓展类
@@ -35,13 +35,13 @@
        /// <param name="pageIndex">当前页码，从1开始</param>
        /// <param name="pageSize">页码容量</param>
        /// <returns></returns>
        public static async Task<SqlSugarPagedList<TEntity>> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> query, int pageIndex, int pageSize)
        public static async Task<SqlSugarPagedList> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> query, int pageIndex, int pageSize)
            where TEntity : new()
        {
            RefAsync<int> total = 0;
            var items = await query.ToPageListAsync(pageIndex, pageSize, total);
            var totalPages = pageSize > 0 ? (int)Math.Ceiling(total / (double)pageSize) : 0;
            return new SqlSugarPagedList<TEntity>
            return new SqlSugarPagedList
            {
                Items = items,
                Total = total,