From 1c1b1dab237cbfc8af97f69689af787a0459fa8c Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Thu, 24 Jul 2025 15:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=BD=AC=E8=AE=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/CustomerController.php | 22 +++++++++-------------
 app/controller/UserController.php     |  2 +-
 app/middleware/AuthMiddleware.php     |  4 +++-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/controller/CustomerController.php b/app/controller/CustomerController.php
index 41d6f50..b7269b0 100644
--- a/app/controller/CustomerController.php
+++ b/app/controller/CustomerController.php
@@ -393,25 +393,21 @@ class CustomerController
     public function cede(Request $request)
     {
         $customerId = Util::getParam($request, 'customer_id');
-        $user_sn = Util::getParam($request, 'user_sn');
-        $userId = $request->user['id'];
-        if (Util::isEmpty($user_sn)) {
-            return Util::fail([], 'ID'.trans('not_null'));
+        $userId = Util::getParam($request, 'user_id');
+        $selfId = $request->user['id'];
+        if (Util::isEmpty($userId)) {
+            return Util::fail([], 'user_id'.trans('not_null'));
+        }
+        if (Util::isEmpty($customerId)) {
+            return Util::fail([], 'customer_id'.trans('not_null'));
         }
 
-        $user = User::where(['sn' => $user_sn])->first();
+        $user = User::where(['id' => $userId])->first();
         if (Util::isEmpty($user)) {
             return Util::fail(null, trans('user_none'));
         }
 
-        if(Util::isEmpty($customerId)){
-            $data = [
-                'user_id' => $userId
-            ];
-            $query= Customer::where($data);
-        }else{
-            $query= Customer::whereIn('id',explode(',',$customerId));
-        }
+        $query= Customer::where('user_id',$selfId)->whereIn('id',$customerId);
         $customer = $query->get();
 
         foreach ($customer as $item) {
diff --git a/app/controller/UserController.php b/app/controller/UserController.php
index f71083e..8716444 100644
--- a/app/controller/UserController.php
+++ b/app/controller/UserController.php
@@ -374,7 +374,7 @@ class UserController
             return Util::fail([], trans('param_error'));
         }
         $data = [
-            'language' => $language,
+//            'language' => $language,
         ];
 
         $res = User::where('id', $id)
diff --git a/app/middleware/AuthMiddleware.php b/app/middleware/AuthMiddleware.php
index 584e5b4..0548481 100644
--- a/app/middleware/AuthMiddleware.php
+++ b/app/middleware/AuthMiddleware.php
@@ -86,8 +86,10 @@ class AuthMiddleware implements MiddlewareInterface
             // 将用户ID存入请求对象，供后续使用
 //            $request->user = ['id' => $userId];
             $request->user = $user;
+            $request->language = $request->header('fdesk-language');
+
 //            locale($user['language']);
-            locale('zh_CN');
+            locale($request->language);
             return $handler($request);
         } catch (BusinessException $e) {
             return json(['code' => 401, 'msg' => $e->getMessage()]);