From c89277b5fc48480ac8e64a00a4ecb9d733f36f02 Mon Sep 17 00:00:00 2001
From: Yurun <admin@yurunsoft.com>
Date: Sat, 11 Dec 2021 09:06:08 +0800
Subject: [PATCH] Optimize user module

---
 module/user/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/user/model.php b/module/user/model.php
index 2b1661f103..834e7b23ee 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -99,8 +99,8 @@ class userModel extends model
 
         $users = $this->dao->select($fields)->from(TABLE_USER)
             ->where('1')
-            ->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi()
             ->beginIF(strpos($params, 'nodeleted') !== false or empty($this->config->user->showDeleted))->andWhere('deleted')->eq('0')->fi()
+            ->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi()
             ->beginIF($accounts)->andWhere('account')->in($accounts)->fi()
             ->orderBy($orderBy)
             ->beginIF($maxCount)->limit($maxCount)->fi()