From 2b3d1de2f6936f7704b5f6f0f05050cc78b777b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E5=BD=A9=E6=9E=AB=E5=8F=B6?= <424235748@qq.com>
Date: Tue, 16 Jan 2024 08:14:28 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E5=91=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=BB=98=E8=AE=A4=E7=8A=B6=E6=80=81=E7=AD=89=E4=BA=8E?=
 =?UTF-8?q?1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 七彩枫叶 <424235748@qq.com>
---
 app/admin/service/UserService.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php
index b5d92c8c..781b8143 100644
--- a/app/admin/service/UserService.php
+++ b/app/admin/service/UserService.php
@@ -36,7 +36,10 @@ class UserService
     {
         $page = (int)$params['page'] ?: 1;
         $limit = (int)$params['limit'] ?: 10;
-        $status = !empty($params['status']) ? $params['status']-1:1;
+        if(!empty($params['status']))
+        {
+            $where[]=['status','=',!empty($params['status']) ? $params['status']-1:1];
+        }
 
         if (!empty($params['nickname'])) {
             $where[] = ['nickname','like','%'.$params['nickname'].'%'];
@@ -45,7 +48,7 @@ class UserService
         if (!empty($params['group_id'])) {
             $where[] = ['group_id','find in set',$params['group_id']];
         }
-        $where[]=['status','=',$status];
+
         $conditions = array_merge($conditions, $where ?? []);
 
         $model = new User();
-- 
Gitee