|
|
@@ -156,7 +156,7 @@ class User extends BaseModel
|
|
|
$map[] = ['user_id','in',$userList];
|
|
|
$list = self::where($map)->whereOr(function ($query) use ($role) {
|
|
|
if ($role > 0) {
|
|
|
- $query->where('service_status', 0);
|
|
|
+ $query->where('role', 0)->where('service_status', 0);
|
|
|
}
|
|
|
})->field($field)->select();
|
|
|
}
|