|
@@ -189,7 +189,7 @@ class MobileController extends UserApi
|
|
|
if($chanId){
|
|
|
if(empty($data['sort'])) {
|
|
|
$activityData = (clone $model)->where('hold_chan', $chanId)->order('sort_line')->select();
|
|
|
- $topRecData = (clone $model)
|
|
|
+ /*$topRecData = (clone $model)
|
|
|
->join('mobile_sub', "mobile_sub.mobile_id=mobile.id and sub_admin_id=$chanId")
|
|
|
->where('sub_top_time|sub_rec_time', 1)
|
|
|
->where(function (Query $query) use ($activityData) {
|
|
@@ -201,7 +201,8 @@ class MobileController extends UserApi
|
|
|
->order('sub_sort_line')
|
|
|
->select();
|
|
|
$subData = $activityData->merge($topRecData);
|
|
|
- $subIds = $subData->column('id');
|
|
|
+ $subIds = $subData->column('id');*/
|
|
|
+ $subIds=$activityData->column('id');
|
|
|
$model->where('is_activity',0);
|
|
|
}
|
|
|
}else{
|