fix 编译错误

This commit is contained in:
2024-03-05 17:07:57 +08:00
parent 509662429b
commit 6fbf517aa2
2 changed files with 1 additions and 34 deletions

View File

@@ -1,12 +1,8 @@
using Dlhis.Basic.Organization.Request;
using Dlhis.Basic.Organization.Response;
using Kurisu.Core.DataAccess.Dto;
using Dlhis.Basic.Organization.Response;
namespace Dlhis.Basic.Organization.Services;
public interface IDepartmentService : IScopeDependency
{
Task<List<DepartmentTreeResponse>> GetTreeAsync();
Task<Pagination<DepartmentTreeResponse>> GetTreePageAsync(DepartmentPageRequest request);
}

View File

@@ -32,35 +32,6 @@ public class DepartmentService : IDepartmentService
return tops;
}
public async Task<Pagination<DepartmentTreeResponse>> GetTreePageAsync(DepartmentPageRequest request)
{
var departments = await _dbContext
.Queryable<DepartmentEntity>()
.WhereIF(!request.Search.IsEmpty(), x => x.Name.Contains(request.Search) || x.No.Contains(request.Search)).ToListAsync();
var tops = departments.Where(x => x.PNo.IsEmpty()).Adapt<List<DepartmentTreeResponse>>();
tops.ForEach(x =>
{
RecursionGetNext(x, departments);
});
// 分页操作
var startIndex = (request.PageIndex - 1) * request.PageSize;
var pagedData = tops.Skip(startIndex).Take(request.PageSize).ToList();
var pagination = new Pagination<DepartmentTreeResponse>
{
PageIndex = request.PageIndex,
PageSize = request.PageSize,
Total = tops.Count, // 使用原始列表的总数进行分页
Data = pagedData
};
return pagination;
}
private void RecursionGetNext(DepartmentTreeResponse current, List<DepartmentEntity> departments)
{
var next = departments.Where(x => x.PNo == current.No).ToList();