提交

app/admin/controller/Admin.php

@@ -298,6 +298,9 @@ class Admin extends BaseController
             
             //结束客服在线时间
             KefuTime::endData($this->admin_id, 2);
+            
+            //结束客服服务时间
+            KefuTime::endData($this->admin_id, 4);
         }
         JWTAuth::invalidate(JWTAuth::token()->get());
         return success(lang('退出成功'));

app/admin/controller/Kefu.php

@@ -41,10 +41,10 @@ class Kefu extends BaseController
             $params = $this->request->param();
             $page = $params['page'] ?? 1;
             $limit = $params['limit'] ?? 15;
-            $query = Admin::alias('admin')->join('kefu_work', 'kefu_work.admin_id = admin.id', 'right')
+            $query = KefuWork::alias('kefu_work')->join('admin', 'kefu_work.admin_id = admin.id', 'left')
                         ->join('user', 'admin.id = user.uid', 'left')
                         ->where('kefu_work.created_at', '>=', date('Y-m-d 00:00:00'));
-            
+
             if (isset($params['is_online'])) {
                 if ($params['is_online'] == 1) {
                     $query->where('user.is_online', '>', 0);