youfeng

app/Service/EmployeeService.php

@@ -2,21 +2,14 @@
 
 namespace App\Service;
 
-use App\Model\BasicType;
 use App\Model\Depart;
-use App\Model\DepartIndex;
-use App\Model\DepartWithDHF;
 use App\Model\Employee;
 use App\Model\EmployeeDepartPermission;
-use App\Model\EmployeeFile;
 use App\Model\EmployeeIndex;
 use App\Model\EmployeeManagerDepart;
 use App\Model\EmployeeMenuPermission;
 use App\Model\EmployeeRole;
 use App\Model\EmployeeTeamPermission;
-use App\Model\ProductCategory;
-use App\Model\ProductInventory;
-use App\Model\ProductInventorySet;
 use App\Model\Role;
 use App\Model\RoleMenu;
 use App\Model\RoleMenuButton;
@@ -36,92 +29,6 @@ use Mockery\Exception;
  */
 class EmployeeService extends Service
 {
-    public function employeeEditImg($data, $user){
-        $time = time();
-        try {
-            DB::beginTransaction();
-
-            $old = EmployeeFile::where('del_time',0)
-                ->where('employee_id',$user['id'])
-                    ->select('file')
-                ->get()->toArray();
-            $old = array_column($old,'file');
-            EmployeeFile::where('del_time',0)
-                ->where('employee_id',$user['id'])
-                ->update(['del_time' => $time]);
-
-            $new = [];
-            $insert = [];
-            if(! empty($data['img_url'])){
-                $insert[] = [
-                    'employee_id' => $user['id'],
-                    'file' => $data['img_url'],
-                    'crt_time' => $time,
-                ];
-                EmployeeFile::insert($insert);
-                $new[] = $data['img_url'];
-            }
-
-            DB::commit();
-        }catch (\Throwable $exception){
-            DB::rollBack();
-            return [false, $exception->getMessage()];
-        }
-
-        return [true, ['file' => ['new' => $new, 'old' => $old]]];
-    }
-
-    public function getEmployeeImg($user){
-        $file = EmployeeFile::where('del_time',0)
-            ->where('employee_id',$user['id'])
-            ->select('file')
-            ->get()->toArray();
-        $file = array_column($file,'file');
-        $file = $file[0] ?? "";
-        $img_str = "";
-        $timpstamp = 86400;
-        if(! empty($file)){
-            $fileUploadService = new FileUploadService();
-            $img_str = $fileUploadService->getFileShow($file, $timpstamp);
-        }
-
-        return [true, ['img_url' => $img_str]];
-    }
-
-    public function employeeEditOther($data,$user){
-        list($status,$msg) = $this->employeeOtherRule($data,$user);
-        if(!$status) return [$status,$msg];
-
-        try {
-            DB::beginTransaction();
-            $model = new Employee();
-            $model = $model->where('id',$user['id'])->first();
-            $model->password = Hash::make($data['new_password']);
-            $model->save();
-
-            DB::commit();
-        }catch (\Exception $exception){
-            DB::rollBack();
-            return [false, $exception->getMessage()];
-        }
-
-        return [true,''];
-    }
-
-    public function employeeOtherRule($data,$user){
-        if(! isset($data['old_password'])) return [false,'请输入原密码'];
-        if($data['old_password'] == "") return [false,'原密码不能为空'];
-        if(! isset($data['new_password'])) return [false,'请输入新密码'];
-        if($data['new_password'] == "") return [false,'新密码不能为空'];
-        if(! isset($data['re_password'])) return [false,'请输入确认密码'];
-        if($data['re_password'] == "") return [false,'确认密码不能为空'];
-        if(! Hash::check($data['old_password'], $user['password'])) return [false,'原密码错误'];
-        if($data['new_password'] == $data['old_password']) return [false,'原密码与新密码一致'];
-        if($data['new_password'] !== $data['re_password']) return [false,'新密码与确认密码不一致'];
-
-        return [true,''];
-    }
-
     /**
      * 用户编辑
      * @param $data
@@ -202,7 +109,7 @@ class EmployeeService extends Service
             $model->is_admin = $data['is_admin'];
             $model->account = $data['number'];
             if($model->is_admin == 1){
-                if($data['password'] !== '********'){
+                if($data['password'] !== '******'){
                     $model->password = Hash::make($data['password']);
                 }
             }
@@ -265,6 +172,7 @@ class EmployeeService extends Service
         $user = Employee::where('id', $data['id'])->where('del_time',0)->first();
         if(empty($user)) return [false, '人员不存在或已被删除'];
         $user = $user->toArray();
+        $user['password'] = "******";
         $detail = EmployeeIndex::where('del_time',0)
             ->where('employee_id',$user['id'])
             ->select('employee_id','index','index_2','index_3','type','start_time','end_time')
@@ -287,8 +195,8 @@ class EmployeeService extends Service
             }
             $role[] = $value->id;
         }
-        $res['role'] = $role;
-        $res['role_name'] = $role_name;
+        $user['role'] = $role;
+        $user['role_name'] = $role_name;
 
         return [true, $user];
     }