|
@@ -1363,7 +1363,7 @@ class Customer extends Base
|
|
|
->where('owner_staff_id != 0 and owner_staff_id is not null')->order($sort, $order)->select();
|
|
->where('owner_staff_id != 0 and owner_staff_id is not null')->order($sort, $order)->select();
|
|
|
|
|
|
|
|
$list = collection($list)->toArray();
|
|
$list = collection($list)->toArray();
|
|
|
- outFileLog($list,'customer','list-export');
|
|
|
|
|
|
|
+// outFileLog($list,'customer','list-export');
|
|
|
if (!$list) {
|
|
if (!$list) {
|
|
|
$this->error('无导出数据');
|
|
$this->error('无导出数据');
|
|
|
}
|
|
}
|
|
@@ -1380,7 +1380,7 @@ class Customer extends Base
|
|
|
foreach ($dataValue as $val) {
|
|
foreach ($dataValue as $val) {
|
|
|
$title[] = $val['config']['label'];
|
|
$title[] = $val['config']['label'];
|
|
|
}
|
|
}
|
|
|
- outFileLog($dataValue,'customer','list-export-$dataValue');
|
|
|
|
|
|
|
+// outFileLog($dataValue,'customer','list-export-$dataValue');
|
|
|
$data=[];
|
|
$data=[];
|
|
|
foreach ($list as $k => $v) {
|
|
foreach ($list as $k => $v) {
|
|
|
if($v['customer_other']){//其他客户
|
|
if($v['customer_other']){//其他客户
|
|
@@ -1388,10 +1388,14 @@ class Customer extends Base
|
|
|
$other=json_decode($other,true);
|
|
$other=json_decode($other,true);
|
|
|
$v = array_merge($v, $other);
|
|
$v = array_merge($v, $other);
|
|
|
}
|
|
}
|
|
|
|
|
+ $staff_where = [];
|
|
|
|
|
+ $staff_where[]=['id','in',$v['owner_staff_id']];
|
|
|
|
|
+ $staff_list = Staff::where($staff_where)->field('name')->select()->toArray();
|
|
|
|
|
+ $satff_arr = array_column($staff_list,'name');
|
|
|
|
|
+ $staff_str = implode('/',$satff_arr);
|
|
|
$field = array(
|
|
$field = array(
|
|
|
$v['id'],
|
|
$v['id'],
|
|
|
-
|
|
|
|
|
- 3,
|
|
|
|
|
|
|
+ $staff_str,
|
|
|
$v['createtime'],
|
|
$v['createtime'],
|
|
|
$v['next_time'],
|
|
$v['next_time'],
|
|
|
$v['last_time'],
|
|
$v['last_time'],
|
