|
@@ -144,6 +144,7 @@ class EmployeeService extends Service
|
|
|
'employee_id' => $user['id'],
|
|
'employee_id' => $user['id'],
|
|
|
'file' => $data['img_url'],
|
|
'file' => $data['img_url'],
|
|
|
'crt_time' => $time,
|
|
'crt_time' => $time,
|
|
|
|
|
+ 'top_depart_id' => $value['top_depart_id'],
|
|
|
];
|
|
];
|
|
|
EmployeeFile::insert($insert);
|
|
EmployeeFile::insert($insert);
|
|
|
$new[] = $data['img_url'];
|
|
$new[] = $data['img_url'];
|
|
@@ -232,6 +233,7 @@ class EmployeeService extends Service
|
|
|
$insert[] = [
|
|
$insert[] = [
|
|
|
'employee_id' => $user['id'],
|
|
'employee_id' => $user['id'],
|
|
|
'file' => $data['img_url'],
|
|
'file' => $data['img_url'],
|
|
|
|
|
+ 'top_depart_id' => $value['top_depart_id'],
|
|
|
'crt_time' => $time,
|
|
'crt_time' => $time,
|
|
|
];
|
|
];
|
|
|
EmployeeFile::insert($insert);
|
|
EmployeeFile::insert($insert);
|
|
@@ -281,22 +283,23 @@ class EmployeeService extends Service
|
|
|
if(empty($data['id'])) return [false,'人员id不能为空'];
|
|
if(empty($data['id'])) return [false,'人员id不能为空'];
|
|
|
list($status, $return) = $this->employeeList(['id' => [$data['id']]], $user);
|
|
list($status, $return) = $this->employeeList(['id' => [$data['id']]], $user);
|
|
|
$user = $return['data'][0] ?? [];
|
|
$user = $return['data'][0] ?? [];
|
|
|
- $img = $this->showUserImg($data['id']);
|
|
|
|
|
|
|
+ list($img, $img2) = $this->showUserImg($data['id']);
|
|
|
$user['img_url'] = $img;
|
|
$user['img_url'] = $img;
|
|
|
|
|
+ $user['img_url_show'] = $img2;
|
|
|
|
|
|
|
|
return [true, $user];
|
|
return [true, $user];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function getEmployeeImg($data, $user){
|
|
public function getEmployeeImg($data, $user){
|
|
|
- $img_str = $this->showUserImg($user['id']);
|
|
|
|
|
|
|
+ list($img, $img_str) = $this->showUserImg($user['id']);
|
|
|
return [true, ['img_url' => $img_str]];
|
|
return [true, ['img_url' => $img_str]];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private function showUserImg($id){
|
|
private function showUserImg($id){
|
|
|
$file = EmployeeFile::where('del_time',0)
|
|
$file = EmployeeFile::where('del_time',0)
|
|
|
->where('employee_id',$id)
|
|
->where('employee_id',$id)
|
|
|
- ->select('file')
|
|
|
|
|
- ->get()->toArray();
|
|
|
|
|
|
|
+ ->pluck('file')
|
|
|
|
|
+ ->toArray();
|
|
|
$file = array_column($file,'file');
|
|
$file = array_column($file,'file');
|
|
|
$file = $file[0] ?? "";
|
|
$file = $file[0] ?? "";
|
|
|
$img_str = "";
|
|
$img_str = "";
|
|
@@ -306,7 +309,7 @@ class EmployeeService extends Service
|
|
|
$img_str = $fileUploadService->getFileShow($file, $timeStamp);
|
|
$img_str = $fileUploadService->getFileShow($file, $timeStamp);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- return $img_str;
|
|
|
|
|
|
|
+ return [$file, $img_str];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function employeeCommon($data,$user, $field = []){
|
|
public function employeeCommon($data,$user, $field = []){
|
