wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

角色查询优化

Browse Source
This commit is contained in:
不做码农 2021-10-11 22:03:54 +08:00
parent 4f9466828f
commit 97bc55a2e2
4 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
View File

@ -38,11 +38,9 @@ namespace ZR.Admin.WebApi.Controllers.System
[HttpGet("list")]
public IActionResult List([FromQuery] SysRole role, [FromQuery] PagerInfo pager)
{
var list = sysRoleService.SelectRoleList(role);
var list = sysRoleService.SelectRoleList(role, pager);
VMPageResult<SysRole> vMPageResult = new(list, pager);
return SUCCESS(vMPageResult, TIME_FORMAT_FULL);
return SUCCESS(list, TIME_FORMAT_FULL);
}
/// <summary>

20
ZR.Repository/System/SysRoleRepository.cs
View File

@ -1,6 +1,8 @@
using Infrastructure.Attribute;
using Infrastructure.Model;
using SqlSugar;
using System.Collections.Generic;
using ZR.Model;
using ZR.Model.System;
namespace ZR.Repository.System
@ -14,8 +16,22 @@ namespace ZR.Repository.System
/// <summary>
/// 根据条件分页查询角色数据
/// </summary>
/// <param name="sysRole"></param>
/// <returns></returns>
public List<SysRole> SelectRoleList(SysRole sysRole)
public List<SysRole> SelectRoleList()
{
return Context.Queryable<SysRole>()
.Where(role => role.DelFlag == "0")
.OrderBy(role => role.RoleSort)
.ToList();
}
/// <summary>
/// 根据条件分页查询角色数据
/// </summary>
/// <param name="sysRole"></param>
/// <param name="pager"></param>
/// <returns></returns>
public PagedInfo<SysRole> SelectRoleList(SysRole sysRole, PagerInfo pager)
{
return Context.Queryable<SysRole>()
.Where(role => role.DelFlag == "0")
@ -23,7 +39,7 @@ namespace ZR.Repository.System
.WhereIF(!string.IsNullOrEmpty(sysRole.Status), role => role.Status == sysRole.Status)
.WhereIF(!string.IsNullOrEmpty(sysRole.RoleKey), role => role.RoleKey == sysRole.RoleKey)
.OrderBy(role => role.RoleSort)
.ToList();
.ToPage(pager);
}
/// <summary>

6
ZR.Service/System/IService/ISysRoleService.cs
View File

@ -1,4 +1,5 @@
using System;
using Infrastructure.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -12,8 +13,9 @@ namespace ZR.Service.System.IService
/// 根据条件分页查询角色数据
/// </summary>
/// <param name="role">角色信息</param>
/// <param name="pager"></param>
/// <returns>角色数据集合信息</returns>
public List<SysRole> SelectRoleList(SysRole role);
public PagedInfo<SysRole> SelectRoleList(SysRole role, Model.PagerInfo pager);
/// <summary>
/// 查询所有角色

8
ZR.Service/System/SysRoleService.cs
View File

@ -1,10 +1,12 @@
using Infrastructure;
using Infrastructure.Attribute;
using Infrastructure.Model;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ZR.Model;
using ZR.Model.System;
using ZR.Repository.System;
using ZR.Service.System.IService;
@ -33,9 +35,9 @@ namespace ZR.Service
/// </summary>
/// <param name="role">角色信息</param>
/// <returns>角色数据集合信息</returns>
public List<SysRole> SelectRoleList(SysRole role)
public PagedInfo<SysRole> SelectRoleList(SysRole role, PagerInfo pager)
{
return SysRoleRepository.SelectRoleList(role);
return SysRoleRepository.SelectRoleList(role, pager);
}
/// <summary>
@ -45,7 +47,7 @@ namespace ZR.Service
/// <returns></returns>
public List<SysRole> SelectRoleAll()
{
return SysRoleRepository.SelectRoleList(new SysRole());
return SysRoleRepository.SelectRoleList();
}
/// <summary>