Merge branch 'dev' of http://git.bocai108.com:10180/Ethan/Customer-Service into dev

application/admin/view/index/index.html

@@ -270,8 +270,8 @@
             $("#realTimeTable").css({"display":"none"});
             $("#commentForm").css({"display":"block"});
             $("#commentTable").css({"display":"block"});
+            initTable()
         }
-        initTable()
     }
     layui.use(['form', 'upload'], function(){
         var form = layui.form;

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -966,7 +966,10 @@ class Events
             return false;
         }
         // 获取旧工单信息.
-        $data = json_decode(self::$redis->HGET('SERVICELOG', $last['servicelog_id']), true);
+        $data = json_decode(self::$redis->HGET('SERVICELOG', $serviceid), true);
+        if (empty($data)) {
+            return;
+        }
         // 修改工单数据.
         $data['user_avatar'] = $userInfo['avatar'];
         $data['client_id'] = $userInfo['client_id'];