Merge branch 'hotfix/user' into develop

2025-08-20 18:19:52 +08:00
parent 3d1503e67b 19082ea6c8
commit 069fe948e6
1 changed files with 0 additions and 1 deletions
@@ -141,7 +141,6 @@ class CustomerService
        }elseif ($sort == 'follow_last') {
            $query = $query->orderBy('crm_customer.follow_last', 'desc');
        }elseif ($sort == 'follow_next') {
-            $query = $query->orderBy('crm_customer.follow_next', 'asc');
            $query = $query->orderByRaw('crm_customer.follow_next IS NULL, crm_customer.follow_next ASC');
        }elseif ($sort == 'id' || empty($sort)) {
            $query = $query->orderBy('crm_customer.id', 'desc');