Преглед на файлове

0号线-修改-添加方法

sunxbiao преди 1 година
родител
ревизия
a1f6ac176e
променени са 1 файла, в които са добавени 12 реда и са изтрити 7 реда
  1. 12 7
      app/controller/admin/user/User.php

+ 12 - 7
app/controller/admin/user/User.php

@@ -1836,9 +1836,16 @@ class User extends BaseController
1836
      */
1836
      */
1837
     public function getZeroLineUserList()
1837
     public function getZeroLineUserList()
1838
     {
1838
     {
1839
-        $result = Db::name('user_zero_line')
1840
-            ->where('status', '=',1)
1841
-            ->select()
1839
+        $team_name = request()->param('team_name', null);
1840
+
1841
+        $query = Db::name('user_zero_line')
1842
+            ->where('status', '=',1);
1843
+
1844
+        if (!is_null($team_name)) {
1845
+            $query->whereLike('team_name', '%' . $team_name . '%');
1846
+        }
1847
+
1848
+        $result = $query->select()
1842
             ->toArray();
1849
             ->toArray();
1843
         return app('json')->success('获取成功', $result);
1850
         return app('json')->success('获取成功', $result);
1844
     }
1851
     }
@@ -1859,8 +1866,7 @@ class User extends BaseController
1859
         $userData = Db::name('user')
1866
         $userData = Db::name('user')
1860
             ->where('uid', '=', $team_uid)
1867
             ->where('uid', '=', $team_uid)
1861
             ->where('is_del', '=', 0)
1868
             ->where('is_del', '=', 0)
1862
-            ->find()
1863
-            ->toArray();
1869
+            ->find();
1864
         if (!$userData) {
1870
         if (!$userData) {
1865
             return app('json')->fail('用户不存在');
1871
             return app('json')->fail('用户不存在');
1866
         }
1872
         }
@@ -1871,8 +1877,7 @@ class User extends BaseController
1871
 
1877
 
1872
         $isExist = Db::name('user_zero_line')
1878
         $isExist = Db::name('user_zero_line')
1873
             ->where('team_uid', '=', $team_uid)
1879
             ->where('team_uid', '=', $team_uid)
1874
-            ->find()
1875
-            ->toArray();
1880
+            ->find();
1876
         if ($isExist) {
1881
         if ($isExist) {
1877
             $result = Db::name('user_zero_line')
1882
             $result = Db::name('user_zero_line')
1878
                 ->where('team_uid', '=', $team_uid)
1883
                 ->where('team_uid', '=', $team_uid)