From 066e8c4382b3db080900701ae528754d370bad03 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Mon, 4 Dec 2023 13:42:17 +0800
Subject: [PATCH] fixed

---
 app/adminapi/lists/user/UserLists.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/lists/user/UserLists.php b/app/adminapi/lists/user/UserLists.php
index ee2036448..4bb29f8f7 100755
--- a/app/adminapi/lists/user/UserLists.php
+++ b/app/adminapi/lists/user/UserLists.php
@@ -39,6 +39,10 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
     public function setSearch(): array
     {
         $allowSearch = ['keyword', 'channel', 'create_time_start', 'create_time_end', 'company_id'];
+        if (empty($this->params['company_id'])) {
+            unset($allowSearch['company_id']);
+            unset($this->params['company_id']);
+        }
         return array_intersect(array_keys($this->params), $allowSearch);
     }
 
@@ -68,13 +72,15 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
 
             }
         }
+
         $field = "id,id contract,sn,nickname,sex,avatar,account,mobile,channel,create_time,admin_id,company_id,street,street as street_name,is_contract";
+
         $lists = User::withSearch($this->setSearch(), $this->params)
-            ->field($field)
-            ->where($where)
             ->with(['company'])
-            ->order('id desc')
+            ->where($where)
             ->limit($this->limitOffset, $this->limitLength)
+            ->field($field)
+            ->order('id desc')
             ->select()
             ->toArray();