0号线-修改-列表

app/controller/admin/user/User.php

@@ -1836,9 +1836,10 @@ class User extends BaseController
      */
     public function getZeroLineUserList()
     {
-        $team_name = request()->param('team_name', null);
-        $status = request()->param('status', null);
-        $user_account = request()->param('account', null);
+        $team_name = request()->param('team_name', '');
+        $status = request()->param('status', '');
+        $user_account = request()->param('account', '');
+        [$page, $limit] = $this->getPage();
 
         $query = Db::name('user_zero_line')
             ->alias('uzl')
@@ -1847,17 +1848,19 @@ class User extends BaseController
             $query->where('uzl.status', '=', $status);
         }
 
-        if (!is_null($team_name)) {
+        if ($team_name != '') {
             $query->whereLike('uzl.team_name', '%' . $team_name . '%');
         }
 
-        if (!is_null($user_account)) {
+        if ($user_account != '') {
             $query
                 ->whereLike('u.account', '%' . $user_account . '%');
         }
 
         $result = $query
             ->field('uzl.*, u.account')
+            ->page($page, $limit)
+            ->order("uzl.id desc")
             ->select()
             ->toArray();