Merge branch 'sql-optimization-zhangrunyu' into 'master'

SQL optimization See merge request easycorp/zentaopms!924
2021-12-20 00:47:21 +00:00
parent ad57d792f1 63bc23d43f
commit 8ba0385b58
5 changed files with 49 additions and 49 deletions
@@ -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()