0号线-修改-列表

app/controller/admin/user/User.php

@@ -1837,6 +1837,7 @@ class User extends BaseController
     public function getZeroLineUserList()
     {
         $team_name = request()->param('team_name', null);
+        $user_account = request()->param('user_account', null);
 
         $query = Db::name('user_zero_line')
             ->where('status', '=',1);
@@ -1845,6 +1846,14 @@ class User extends BaseController
             $query->whereLike('team_name', '%' . $team_name . '%');
         }
 
+        if (!is_null($user_account)) {
+            $query
+                ->alias('uzl')
+                ->leftJoin('user u', 'u.uid = uzl.uid')
+                ->whereLike('u.account', '%' . $user_account . '%')
+                ->field('uzl.*');
+        }
+
         $result = $query->select()
             ->toArray();
         return app('json')->success('获取成功', $result);
@@ -1893,7 +1902,9 @@ class User extends BaseController
                     'status' => $status
                 ]);
         }
-
-        return app('json')->success('设置成功', $result);
+        if ($result) {
+            return app('json')->success('设置成功', $result);
+        }
+        return app('json')->fail('设置失败');
     }
 }