Merge branch 'feature/user0812' into develop

2025-08-14 19:23:24 +08:00
parent 0323c2db7e c85a170114
commit 5eeec1747e
1 changed files with 4 additions and 1 deletions
@@ -114,9 +114,12 @@ class CustomerService
            $query->whereIn('grade', $grade);
        }

-        if ($recycle == 'recycle' || $scene == 'recycle' || $seas == 'seas' || $scene == 'seas' || $scene == 'audit') {
+        if ($recycle == 'recycle' || $scene == 'recycle' || $scene == 'audit') {
            $query->onlyTrashed();
        }
+        if ($seas == 'seas' || $scene == 'seas') {
+            $query->withTrashed();
+        }

        if (!$export) {
            $customer = $query->orderBy('id', 'desc')->paginate($perPage, ['*'], 'page', $page);