Merge branch 'master' into develop

2025-07-31 10:36:30 +08:00
parent 8f4db9ed97
commit 0f650f6bfc
4 changed files with 40 additions and 1 deletions
@@ -162,6 +162,9 @@ class CustomerController extends BaseController
        try {
            $param = $request->all();
            $param['user_id'] = $request->user->uid;
+            if($param['user_id']==78){
+                $param['user_id'] = 101;
+            }
            $param['corp_abbr'] = $request->basic_data['corp_abbr'];
            $result = (new CustomerService())->list($param);

@@ -96,7 +96,7 @@ class CustomerService
            $query->withTrashed();
        }

-        $customer = $query->paginate($perPage, ['*'], 'page', $page);
+        $customer = $query->orderBy('id','desc')->paginate($perPage, ['*'], 'page', $page);
        foreach ($customer as &$item) {
            $item = $this->getCustomer($item);
            if($seas == 'seas'){