From 97bc55a2e268586402a77b133528b2ba197cd4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Mon, 11 Oct 2021 22:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/SysRoleController.cs   |  6 ++----
 ZR.Repository/System/SysRoleRepository.cs     | 20 +++++++++++++++++--
 ZR.Service/System/IService/ISysRoleService.cs |  6 ++++--
 ZR.Service/System/SysRoleService.cs           |  8 +++++---
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
index 9fe0d43..171b9db 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
@@ -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>
diff --git a/ZR.Repository/System/SysRoleRepository.cs b/ZR.Repository/System/SysRoleRepository.cs
index 2a70a10..0b90901 100644
--- a/ZR.Repository/System/SysRoleRepository.cs
+++ b/ZR.Repository/System/SysRoleRepository.cs
@@ -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>
diff --git a/ZR.Service/System/IService/ISysRoleService.cs b/ZR.Service/System/IService/ISysRoleService.cs
index f4f2bcc..b4947f1 100644
--- a/ZR.Service/System/IService/ISysRoleService.cs
+++ b/ZR.Service/System/IService/ISysRoleService.cs
@@ -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>
         /// 查询所有角色
diff --git a/ZR.Service/System/SysRoleService.cs b/ZR.Service/System/SysRoleService.cs
index 94b82f4..f0df631 100644
--- a/ZR.Service/System/SysRoleService.cs
+++ b/ZR.Service/System/SysRoleService.cs
@@ -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>