公海客户

2025-07-25 14:39:40 +08:00
parent cf3d6a6dcf
commit d777c1924d
1 changed files with 6 additions and 3 deletions
@@ -80,15 +80,18 @@ class CustomerService
            $query->whereIn('grade', $grade);
        }

-        if ($recycle == 'recycle' || $seas == 'seas') {
+        if ($recycle == 'recycle') {
            $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) {
            $item = $this->getCustomer($item);
            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);