|
|
@@ -1836,9 +1836,16 @@ class User extends BaseController
|
|
1836
|
1836
|
*/
|
|
1837
|
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
|
1849
|
->toArray();
|
|
1843
|
1850
|
return app('json')->success('获取成功', $result);
|
|
1844
|
1851
|
}
|
|
|
@@ -1859,8 +1866,7 @@ class User extends BaseController
|
|
1859
|
1866
|
$userData = Db::name('user')
|
|
1860
|
1867
|
->where('uid', '=', $team_uid)
|
|
1861
|
1868
|
->where('is_del', '=', 0)
|
|
1862
|
|
- ->find()
|
|
1863
|
|
- ->toArray();
|
|
|
1869
|
+ ->find();
|
|
1864
|
1870
|
if (!$userData) {
|
|
1865
|
1871
|
return app('json')->fail('用户不存在');
|
|
1866
|
1872
|
}
|
|
|
@@ -1871,8 +1877,7 @@ class User extends BaseController
|
|
1871
|
1877
|
|
|
1872
|
1878
|
$isExist = Db::name('user_zero_line')
|
|
1873
|
1879
|
->where('team_uid', '=', $team_uid)
|
|
1874
|
|
- ->find()
|
|
1875
|
|
- ->toArray();
|
|
|
1880
|
+ ->find();
|
|
1876
|
1881
|
if ($isExist) {
|
|
1877
|
1882
|
$result = Db::name('user_zero_line')
|
|
1878
|
1883
|
->where('team_uid', '=', $team_uid)
|