|
|
|
|
@ -210,10 +210,10 @@ class UserController extends BaseController
|
|
|
|
|
$query->with('course.typeDetail')->orderBy('fee_status', 'desc');
|
|
|
|
|
}
|
|
|
|
|
])->withCount([
|
|
|
|
|
'appointments' => function ($query) {
|
|
|
|
|
$query->whereIn('status', [0, 1]);
|
|
|
|
|
}
|
|
|
|
|
]);
|
|
|
|
|
'appointments' => function ($query) {
|
|
|
|
|
$query->whereIn('status', [0, 1]);
|
|
|
|
|
}
|
|
|
|
|
]);
|
|
|
|
|
// 是否被投企业
|
|
|
|
|
if (isset($all['is_yh_invested'])) {
|
|
|
|
|
$list = $list->whereHas('company', function ($query) use ($all) {
|
|
|
|
|
@ -287,7 +287,7 @@ class UserController extends BaseController
|
|
|
|
|
}
|
|
|
|
|
$list = $list->where(function ($query) use ($all) {
|
|
|
|
|
if (isset($all['from'])) {
|
|
|
|
|
$query->where('from', $all['from']);
|
|
|
|
|
$query->where('from', 'like', '%' . $all['from'] . '%');
|
|
|
|
|
}
|
|
|
|
|
if (isset($all['is_vip'])) {
|
|
|
|
|
$query->where('is_vip', $all['is_vip']);
|
|
|
|
|
@ -540,8 +540,7 @@ class UserController extends BaseController
|
|
|
|
|
} else {
|
|
|
|
|
if (in_array($k, ['company_type', 'type'])) {
|
|
|
|
|
$list[$key][$k] = str_replace('、', ',', $value[$v]);
|
|
|
|
|
$list[$key][$k] = str_replace(',', ',', $list[$key][$k]);
|
|
|
|
|
;
|
|
|
|
|
$list[$key][$k] = str_replace(',', ',', $list[$key][$k]);;
|
|
|
|
|
} else {
|
|
|
|
|
$list[$key][$k] = $value[$v];
|
|
|
|
|
}
|
|
|
|
|
|