提交

app/admin/command/UserTimeout.php

@@ -104,7 +104,7 @@ class UserTimeout extends Command
                 try {
                     Db::startTrans();
                     //用户转给机器人客服
-                    User::where('user_id', $user['user_id'])->update(['service_status' => 0, 'service_start' => 0, 'timeout_type' => 0, 'cs_uid'=>$cs_uid]);
+                    User::where('user_id', $user['user_id'])->update(['service_status' => -1, 'service_start' => 0, 'timeout_type' => 0, 'cs_uid'=>$cs_uid]);
                     KefuTime::endData($user['uid'], 3, $user['cs_uid']); //结束接线时间
 
                     Db::commit();

app/admin/controller/Question.php

@@ -28,11 +28,9 @@ class Question extends BaseController
             $language_code = $params['language_code'] ?? $this->lang;
 
             $query = QuestionLanguages::alias('question_languages')
-                        ->join('keyword_languages', 'keyword_languages.id = question_languages.keyword_id', 'left');
+                        ->join('keyword_languages', 'keyword_languages.keyword_id = question_languages.keyword_id', 'left')
+                        ->where('question_languages.language_code', $language_code);
                         
-            if (!empty($language_code)) {
-                $query = $query->where('question_languages.language_code', $language_code);
-            }
             if (!empty($question)) {
                 $query = $query->where(function ($query) use ($question) {
                     $query->where('question_languages.question', 'like', "%{$question}%")

app/enterprise/controller/Im.php

@@ -40,7 +40,7 @@ class Im extends BaseController
         }
         $exist = Message::where('msg_id', $msg_id)->where('to_user', $user_id)->find();
         if ($exist && $exist['is_click'] == 0) {
-            $extends = $exist['extends'] && !is_array($exist['extends']) ? json_decode($exist['extends'], true) : [];
+            $extends = $exist['extends'] && !is_array($exist['extends']) ? json_decode($exist['extends'], true) : $exist['extends'];
             if (!empty($extends['cs_uid'])) {
                 Score::create([
                     'user_id' => $user_id,