Bläddra i källkod

0号线-修改-列表

sunxbiao 1 år sedan
förälder
incheckning
6d94177088
1 ändrade filer med 6 tillägg och 3 borttagningar
  1. 6 3
      app/controller/admin/user/User.php

+ 6 - 3
app/controller/admin/user/User.php

@@ -1837,18 +1837,21 @@ class User extends BaseController
1837
     public function getZeroLineUserList()
1837
     public function getZeroLineUserList()
1838
     {
1838
     {
1839
         $team_name = request()->param('team_name', null);
1839
         $team_name = request()->param('team_name', null);
1840
+        $status = request()->param('status', null);
1840
         $user_account = request()->param('user_account', null);
1841
         $user_account = request()->param('user_account', null);
1841
 
1842
 
1842
         $query = Db::name('user_zero_line')
1843
         $query = Db::name('user_zero_line')
1843
-            ->where('status', '=',1);
1844
+            ->alias('uzl');
1845
+        if (!is_null($status)) {
1846
+            $query->where('uzl.status', '=', $status);
1847
+        }
1844
 
1848
 
1845
         if (!is_null($team_name)) {
1849
         if (!is_null($team_name)) {
1846
-            $query->whereLike('team_name', '%' . $team_name . '%');
1850
+            $query->whereLike('uzl.team_name', '%' . $team_name . '%');
1847
         }
1851
         }
1848
 
1852
 
1849
         if (!is_null($user_account)) {
1853
         if (!is_null($user_account)) {
1850
             $query
1854
             $query
1851
-                ->alias('uzl')
1852
                 ->leftJoin('user u', 'u.uid = uzl.uid')
1855
                 ->leftJoin('user u', 'u.uid = uzl.uid')
1853
                 ->whereLike('u.account', '%' . $user_account . '%')
1856
                 ->whereLike('u.account', '%' . $user_account . '%')
1854
                 ->field('uzl.*');
1857
                 ->field('uzl.*');