检查与旧密码是否相同

common/models/forms/UserForm.php

@@ -575,6 +575,10 @@ class UserForm extends Model
             $this->addError('modifyPassword', '原登录密码错误');
             return false;
         }
+        if ($this->oldPassword == $this->password) {
+            $this->addError('modifyPassword', '新登录密码不能与原登录密码相同');
+            return false;
+        }
 
         // 进行规则的判断
         $message = $model->verificationPassword($this->password,$this->scenario,$model);
@@ -603,6 +607,17 @@ class UserForm extends Model
             $this->addError('modifyPasswordPay', '原支付密码错误');
             return false;
         }
+        if ($this->oldPassword == $this->payPassword) {
+            $this->addError('modifyPasswordPay', '新支付密码不能与原支付密码相同');
+            return false;
+        }
+
+        // 进行规则的判断
+        $message = $model->verificationPassword($this->payPassword,$this->scenario,$model);
+        if ( $message['code'] != 200 ){
+            $this->addError($message['type'], $message['message']);
+            return null;
+        }
         $model->PAY_PASSWORD = \Yii::$app->security->generatePasswordHash($this->payPassword);
         if(!$model->save()){
             $this->addErrors($model->getErrors());
@@ -628,6 +643,10 @@ class UserForm extends Model
             $this->addError('noLoginModifyPassword', '原登录密码错误');
             return false;
         }
+        if ($this->oldPassword==$this->password){
+            $this->addError('noLoginModifyPassword', '新登录密码不能与原登录密码相同');
+            return false;
+        }
 
         // 进行规则的判断
         $message = $model->verificationPassword($this->password,$this->scenario,$model);