|
|
@@ -390,20 +390,24 @@ class SalesOrderService extends Service
|
|
|
}
|
|
|
|
|
|
$emp_map = Employee::whereIn('id',array_unique($emp_id))
|
|
|
+ ->where('del_time',0)
|
|
|
->pluck('emp_name','id')
|
|
|
->toArray();
|
|
|
foreach ($sales_info as $value){
|
|
|
if(in_array($value['type'],SalesOrderInfo::$man)){
|
|
|
- $tmp = [
|
|
|
- 'id' => $value['data_id'],
|
|
|
- 'name' => $emp_map[$value['data_id']] ?? '',
|
|
|
- ];
|
|
|
- if($value['type'] == SalesOrderInfo::type_one){
|
|
|
- $sales['employee_one'][] = $tmp;
|
|
|
- }elseif ($value['type'] == SalesOrderInfo::type_two){
|
|
|
- $sales['employee_two'][] = $tmp;
|
|
|
- }elseif ($value['type'] == SalesOrderInfo::type_three){
|
|
|
- $sales['employee_three'][] = $tmp;
|
|
|
+ $tt = $emp_map[$value['data_id']] ?? '';
|
|
|
+ if(! empty($tt)){
|
|
|
+ $tmp = [
|
|
|
+ 'id' => $value['data_id'],
|
|
|
+ 'name' => $emp_map[$value['data_id']] ?? '',
|
|
|
+ ];
|
|
|
+ if($value['type'] == SalesOrderInfo::type_one){
|
|
|
+ $sales['employee_one'][] = $tmp;
|
|
|
+ }elseif ($value['type'] == SalesOrderInfo::type_two){
|
|
|
+ $sales['employee_two'][] = $tmp;
|
|
|
+ }elseif ($value['type'] == SalesOrderInfo::type_three){
|
|
|
+ $sales['employee_three'][] = $tmp;
|
|
|
+ }
|
|
|
}
|
|
|
} elseif ($value['type'] == SalesOrderInfo::type_four){
|
|
|
$sales['file'][] = [
|
cqpCow