公海客户
This commit is contained in:
@@ -80,15 +80,18 @@ class CustomerService
|
|||||||
$query->whereIn('grade', $grade);
|
$query->whereIn('grade', $grade);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($recycle == 'recycle' || $seas == 'seas') {
|
if ($recycle == 'recycle') {
|
||||||
$query->onlyTrashed();
|
$query->onlyTrashed();
|
||||||
}
|
}
|
||||||
|
if ($seas == 'seas') {
|
||||||
|
$query->withTrashed()();
|
||||||
|
}
|
||||||
|
|
||||||
$customer = Customer::where($where)->paginate($perPage, ['*'], 'page', $page);
|
$customer = $query->paginate($perPage, ['*'], 'page', $page);
|
||||||
foreach ($customer as &$item) {
|
foreach ($customer as &$item) {
|
||||||
$item = $this->getCustomer($item);
|
$item = $this->getCustomer($item);
|
||||||
if($seas == 'seas'){
|
if($seas == 'seas'){
|
||||||
$item['seas_time'] = time()-(empty($item['deleted_at'])?0:strtotime($item['deleted_at']));
|
$item['seas_time'] = time()-(empty($item['deleted_at'])?$item['updated_at']:strtotime($item['deleted_at']));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
unset($item);
|
unset($item);
|
||||||
|
|||||||
Reference in New Issue
Block a user