xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

db查询对象简化

Browse Source
This commit is contained in:
chenchun
2022-09-10 13:36:01 +08:00
parent 0fb57a0a2c
commit eebafda9e5
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Framework.Net6/Yi.Framework.Service/LogService.cs
View File

@@ -17,7 +17,7 @@ namespace Yi.Framework.Service
public async Task<List<LogEntity>> GetListTest()
{
return await _repository._Db.Queryable<LogEntity>().SplitTable(tas => tas.Where(u => u.TableName.Contains("2020") || u.TableName.Contains("2021"))).ToListAsync();
return await _repository._DbQueryable.SplitTable(tas => tas.Where(u => u.TableName.Contains("2020") || u.TableName.Contains("2021"))).ToListAsync();
}
}
}

2
Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs
View File

@@ -12,7 +12,7 @@ namespace Yi.Framework.Service
{
public async Task<List<MenuEntity>> SelctGetList(MenuEntity menu)
{
var data = await _repository._Db.Queryable<MenuEntity>()
var data = await _repository._DbQueryable
.WhereIF(!string.IsNullOrEmpty(menu.MenuName), u => u.MenuName.Contains(menu.MenuName))
.Where(u => u.IsDeleted == false)
.OrderBy(u => u.OrderNum, OrderByType.Desc)

2
Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs
View File

@@ -54,7 +54,7 @@ namespace Yi.Framework.Service
public async Task<PageModel<List<RoleEntity>>> SelctPageList(RoleEntity role, PageParModel page)
{
RefAsync<int> total = 0;
var data = await _repository._Db.Queryable<RoleEntity>()
var data = await _repository._DbQueryable
.WhereIF(!string.IsNullOrEmpty(role.RoleName), u => u.RoleName.Contains(role.RoleName))
.WhereIF(!string.IsNullOrEmpty(role.RoleCode), u => u.RoleCode.Contains(role.RoleCode))
.WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime)

8
Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
View File

@@ -72,7 +72,7 @@ namespace Yi.Framework.Service
public async Task<List<UserEntity>> GetListInRole()
{
return await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles).ToListAsync();
return await _repository._DbQueryable.Includes(u => u.Roles).ToListAsync();
}
public async Task<bool> GiveUserSetRole(List<long> userIds, List<long> roleIds)
@@ -105,7 +105,7 @@ namespace Yi.Framework.Service
public async Task<List<RoleEntity>> GetRoleListByUserId(long userId)
{
return (await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles).InSingleAsync(userId)).Roles;
return (await _repository._DbQueryable.Includes(u => u.Roles).InSingleAsync(userId)).Roles;
}
public async Task<UserRoleMenuDto> GetUserAllInfo(long userId)
@@ -115,7 +115,7 @@ namespace Yi.Framework.Service
//首先获取到该用户全部信息，导航到角色、菜单，(菜单需要去重,完全交给Set来处理即可)
//得到用户
var user = await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles.Where(r => r.IsDeleted == false).ToList(), r => r.Menus.Where(m => m.IsDeleted == false).ToList()).InSingleAsync(userId);
var user = await _repository._DbQueryable.Includes(u => u.Roles.Where(r => r.IsDeleted == false).ToList(), r => r.Menus.Where(m => m.IsDeleted == false).ToList()).InSingleAsync(userId);
//得到角色集合
var roleList = user.Roles;
@@ -168,7 +168,7 @@ namespace Yi.Framework.Service
public async Task<PageModel<List<UserEntity>>> SelctPageList(UserEntity user, PageParModel page)
{
RefAsync<int> total = 0;
var data = await _repository._Db.Queryable<UserEntity>()
var data = await _repository._DbQueryable
.WhereIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName))
.WhereIF(!string.IsNullOrEmpty(user.Name), u => u.Name.Contains(user.Name))
.WhereIF(!string.IsNullOrEmpty(user.Phone), u => u.Phone.Contains(user.Phone))