diff --git a/application/admin/controller/orders/Review.php b/application/admin/controller/orders/Review.php
index a7d9e6d..63278af 100644
--- a/application/admin/controller/orders/Review.php
+++ b/application/admin/controller/orders/Review.php
@@ -106,8 +106,8 @@ class Review extends Backend
             $params['admin_id'] = $this->auth->id;
             $params['admin_user'] = $this->auth->nickname;
 
-            if(!empty($order->dispatch->worker_id)){
-                $params['worker_id'] = $order->dispatch;
+            if(!empty($order->worker_id)){
+                $params['worker_id'] = $order->worker_id;
             }
             if($order->status == 60){
                 $params['is_star'] = 1;
@@ -116,6 +116,7 @@ class Review extends Backend
             $result = $this->model->allowField(true)->save($params);
             $order->revisit_id = $this->auth->id;
             $order->revisit_truth = $params['is_same'];
+            $order->revisit_time = date('Y-m-d H:i:s');
             $order->save();
             Db::commit();
 
@@ -133,6 +134,7 @@ class Review extends Backend
         } catch (ValidateException|PDOException|Exception $e) {
             Db::rollback();
             $this->error($e->getMessage());
+
         }
         if ($result === false) {
             $this->error(__('No rows were inserted'));
diff --git a/public/assets/js/backend/orders/revisitorder.js b/public/assets/js/backend/orders/revisitorder.js
index aa148e9..f4c5e5f 100644
--- a/public/assets/js/backend/orders/revisitorder.js
+++ b/public/assets/js/backend/orders/revisitorder.js
@@ -93,7 +93,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
                         {field: 'review.pt_star', title: __('Review.pt_star'),operate: false},
                         {field: 'review.worker_star', title: __('Review.worker_star'),operate: false},
-                        {field: 'review.remark', title: __('回访备注'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'review.remark', title: __('回访备注'), operate: false, table: table, class: 'autocontent', formatter: function (value){
+
+                            if(value == null || value == undefined){
+                                return '-';
+                            }
+                            return value;
+                            }},
                         {field: 'review.admin_user', title: __('Review.admin_user'), operate: false},
 
                         {field: 'revisit_time', title: __('回访时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},