1

app/Service/EmployeeService.php

@@ -37,7 +37,7 @@ class EmployeeService extends Service
         try {
             DB::beginTransaction();
             $model = new Employee();
-            $model = $model->where('id',$data['id'])->first();
+            $model = $model->where('id',$user['id'])->first();
             $model->password = Hash::make($data['new_password']);
             $model->save();
 
@@ -58,7 +58,8 @@ class EmployeeService extends Service
         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['old_password']) return [false,'原密码与新密码一致'];
+        if($data['new_password'] !== $data['re_password']) return [false,'新密码与确认密码不一致'];
 
         return [true,''];
     }