Browse Source

小高薪

cqp 2 tháng trước cách đây
mục cha
commit
0a137c90bf

+ 14 - 0
app/Model/EmployeeFile.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class EmployeeFile extends Model
+{
+    protected $table = "employee_file"; //指定表
+    const CREATED_AT = null;
+    const UPDATED_AT = null;
+    protected $dateFormat = 'U';
+
+}

+ 9 - 3
app/Service/EmployeeService.php

@@ -6,7 +6,6 @@ use App\Model\CalendarDetails;
 use App\Model\Depart;
 use App\Model\Depart;
 use App\Model\Employee;
 use App\Model\Employee;
 use App\Model\EmployeeDepartPermission;
 use App\Model\EmployeeDepartPermission;
-use App\Model\EmployeeDetails;
 use App\Model\EmployeeFile;
 use App\Model\EmployeeFile;
 use App\Model\EmployeeRole;
 use App\Model\EmployeeRole;
 use App\Model\EmployeeWorkRange;
 use App\Model\EmployeeWorkRange;
@@ -282,13 +281,20 @@ 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']);
+        $user['img_url'] = $img;
 
 
         return [true, $user];
         return [true, $user];
     }
     }
 
 
     public function getEmployeeImg($data, $user){
     public function getEmployeeImg($data, $user){
+        $img_str = $this->showUserImg($user['id']);
+        return [true, ['img_url' => $img_str]];
+    }
+
+    private function showUserImg($id){
         $file = EmployeeFile::where('del_time',0)
         $file = EmployeeFile::where('del_time',0)
-            ->where('employee_id',$user['id'])
+            ->where('employee_id',$id)
             ->select('file')
             ->select('file')
             ->get()->toArray();
             ->get()->toArray();
         $file = array_column($file,'file');
         $file = array_column($file,'file');
@@ -300,7 +306,7 @@ class EmployeeService extends Service
             $img_str = $fileUploadService->getFileShow($file, $timeStamp);
             $img_str = $fileUploadService->getFileShow($file, $timeStamp);
         }
         }
 
 
-        return [true, ['img_url' => $img_str]];
+        return $img_str;
     }
     }
 
 
     public function employeeCommon($data,$user, $field = []){
     public function employeeCommon($data,$user, $field = []){