作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !2914
@@ -14,6 +14,7 @@ use App\Models\Inquiry\InquiryProjectRoute; @@ -14,6 +14,7 @@ use App\Models\Inquiry\InquiryProjectRoute;
14 use App\Models\Inquiry\InquiryRelayAi; 14 use App\Models\Inquiry\InquiryRelayAi;
15 use App\Models\Inquiry\InquiryRelayDetail; 15 use App\Models\Inquiry\InquiryRelayDetail;
16 use App\Models\Inquiry\InquiryRelayDetailLog; 16 use App\Models\Inquiry\InquiryRelayDetailLog;
  17 +use App\Models\Manage\Manage;
17 use Illuminate\Support\Arr; 18 use Illuminate\Support\Arr;
18 use Illuminate\Support\Facades\DB; 19 use Illuminate\Support\Facades\DB;
19 use Illuminate\Support\Str; 20 use Illuminate\Support\Str;
@@ -436,6 +437,23 @@ class InquiryForwardLogic extends BaseLogic @@ -436,6 +437,23 @@ class InquiryForwardLogic extends BaseLogic
436 { 437 {
437 $model = new InquiryRelayDetail(); 438 $model = new InquiryRelayDetail();
438 $lists = $model->listsWith($map, $page, $row, $order, $filed, 'desc', ['detailLog']); 439 $lists = $model->listsWith($map, $page, $row, $order, $filed, 'desc', ['detailLog']);
  440 +
  441 + //获取操作人
  442 + $inquiry_info_model = new InquiryInfo();
  443 + $manage_model = new Manage();
  444 + foreach ($lists['list'] as $k => $v) {
  445 + $operator_name = '';
  446 + $inquiry_info = $inquiry_info_model->read(['id' => $v['form_id']], ['operator_id']);
  447 + if ($inquiry_info) {
  448 + $manage_info = $manage_model->read(['id' => $inquiry_info['operator_id']], ['name']);
  449 + if ($manage_info) {
  450 + $operator_name = $manage_info['name'];
  451 + }
  452 + }
  453 +
  454 + $lists['list'][$k]['operator_name'] = $operator_name;
  455 + }
  456 +
439 return $this->success($lists); 457 return $this->success($lists);
440 } 458 }
441 459