From 86192ad03e1061ff6bd69b0f85d3de40faf9e224 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 28 May 2024 10:24:20 +0800
Subject: [PATCH] update

---
 app/adminapi/lists/auth/AdminLists.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/lists/auth/AdminLists.php b/app/adminapi/lists/auth/AdminLists.php
index 9b78e24c9..eb6465a64 100755
--- a/app/adminapi/lists/auth/AdminLists.php
+++ b/app/adminapi/lists/auth/AdminLists.php
@@ -33,6 +33,7 @@ use app\common\model\dept\Orgs;
  */
 class AdminLists extends BaseAdminDataLists implements ListsExtendInterface, ListsSearchInterface, ListsSortInterface,ListsExcelInterface
 {
+	private $where = [];
     /**
      * @notes 设置导出字段
      * @return string[]
@@ -118,8 +119,12 @@ class AdminLists extends BaseAdminDataLists implements ListsExtendInterface, Lis
      */
     public function lists(): array
     {
-		
-        $adminLists = Admin::where($this->searchWhere)
+		$role_id = $this->request->get('role_id');
+		if(!empty($role_id)){
+			$admin_id = AdminRole::where('role_id',$role_id)->column('admin_id');
+			$this->where[] = ['id','in',$admin_id];
+		}
+        $adminLists = Admin::where($this->searchWhere)->where($this->where)
             ->limit($this->limitOffset, $this->limitLength)
             ->order($this->sortOrder)
             ->append(['role_id','disable_desc'])
@@ -164,8 +169,7 @@ class AdminLists extends BaseAdminDataLists implements ListsExtendInterface, Lis
      */
     public function count(): int
     {
-        return Admin::where($this->searchWhere)
-            ->count();
+        return Admin::where($this->searchWhere)->where($this->where)->count();
     }
 
     public function extend()