合并分支 'akun' 到 'master'

Akun



查看合并请求 !2939

@@ -68,6 +68,14 @@ class InquiryForwardLogic extends BaseLogic
     public function getInquiryLists($map, $page, $row, $order = 'id', $filed = ['*'])
     public function getInquiryLists($map, $page, $row, $order = 'id', $filed = ['*'])
     {
     {
         $lists = $this->model->lists($map, $page, $row, $order, $filed);
         $lists = $this->model->lists($map, $page, $row, $order, $filed);
+
+        //获取操作人
+        $manage_model = new Manage();
+        foreach ($lists['list'] as $k => $v) {
+            $manage_info = $manage_model->read(['id' => $v['operator_id']], ['name']);
+            $lists['list'][$k]['operator_name'] = $manage_info ? $manage_info['name'] : '';
+        }
+
         //统计各个状态询盘总数
         //统计各个状态询盘总数
         if (isset($map['status'])) {
         if (isset($map['status'])) {
             unset($map['status']);
             unset($map['status']);
@@ -438,23 +446,6 @@ class InquiryForwardLogic extends BaseLogic
     {
     {
         $model = new InquiryRelayDetail();
         $model = new InquiryRelayDetail();
         $lists = $model->listsWith($map, $page, $row, $order, $filed, 'desc', ['detailLog']);
         $lists = $model->listsWith($map, $page, $row, $order, $filed, 'desc', ['detailLog']);
-
-        //获取操作人
-        $inquiry_info_model = new InquiryInfo();
-        $manage_model = new Manage();
-        foreach ($lists['list'] as $k => $v) {
-            $operator_name = '';
-            $inquiry_info = $inquiry_info_model->read(['id' => $v['form_id']], ['operator_id']);
-            if ($inquiry_info) {
-                $manage_info = $manage_model->read(['id' => $inquiry_info['operator_id']], ['name']);
-                if ($manage_info) {
-                    $operator_name = $manage_info['name'];
-                }
-            }
-
-            $lists['list'][$k]['operator_name'] = $operator_name;
-        }
-
         return $this->success($lists);
         return $this->success($lists);
     }
     }