yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
liguoyang
2024-02-21 16:44:42 +08:00
parent 82644f5e8a 732a477880
commit e491491192
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs
View File

@@ -21,7 +21,8 @@ public class DepartmentService : IDepartmentService
public async Task<List<DepartmentTreeResponse>> GetTreeAsync() public async Task<List<DepartmentTreeResponse>> GetTreeAsync()
{ {
var departments = await _dbContext.Queryable<DepartmentEntity>().ToListAsync(); var departments = await _dbContext.Queryable<DepartmentEntity>().ToListAsync();
var tops = departments.Where(x => x.PNo.IsEmpty()).Adapt<List<DepartmentTreeResponse>>(); //00001000 一定是这个开头的
var tops = departments.Where(x => x.PNo == "00001000").Adapt<List<DepartmentTreeResponse>>();
tops.ForEach(x => tops.ForEach(x =>
{ {
@@ -35,7 +36,7 @@ public class DepartmentService : IDepartmentService
{ {
var departments = await _dbContext var departments = await _dbContext
.Queryable<DepartmentEntity>() .Queryable<DepartmentEntity>()
.WhereIF(!request.Search.IsEmpty(),x => x.Name.Contains(request.Search) || x.No.Contains(request.Search)).ToListAsync(); .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>>(); var tops = departments.Where(x => x.PNo.IsEmpty()).Adapt<List<DepartmentTreeResponse>>();