数字社区修改密码 时填写原密码且加密3

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -743,7 +743,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         if (StringUtils.isNotBlank(staffResetPwFormDTO.getOldPassword())){
             //密码加密
             String oldPasswordFormParam = PasswordUtils.encode(staffResetPwFormDTO.getOldPassword());
-            if (!oldPasswordFormDB.equals(oldPasswordFormParam)) {
+            log.info("resetStaffPassword:oldP:{},DB:{}",oldPasswordFormParam,oldPasswordFormDB);
+            if (!PasswordUtils.matches(oldPasswordFormParam, oldPasswordFormDB)) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),EpmetErrorCode.ERR10004.getMsg(),EpmetErrorCode.ERR10004.getMsg());
             }
         }