diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
index d7179df1..722f1d1a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
@@ -210,7 +210,8 @@ public class CompanyLoginController {
         if (StringUtils.isBlank(contactsManagement.getPassword())){
             return Result.error("updatePassword");
         }
-        return Result.OK();
+        String string = redisUtil.get("_verification:_phone:" + PasswordUtil.decrypt(phone)).toString();
+        return Result.OK(string);
     }
 
     @ApiOperation(value = "短信验证码修改密码")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
index 912a25a6..796098c4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
@@ -82,7 +82,7 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
         }
 
         //处理手机获取验证码的逻辑
-        Object obj = redisUtil.get("_verification:_phone:" + companyLoginVO.getPhone());
+        Object obj = redisUtil.get("_verification:_phone:" + phone);
         if (obj == null) {
             throw new JeroBootException("验证码失效,请重新发送");
         }
@@ -95,14 +95,16 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
             throw new JeroBootException("新密码和确认密码不一致,请重新输入");
         }
         LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PayContactsManagement::getPhone, phone);
+        queryWrapper.eq(PayContactsManagement::getPhone, PasswordUtil.encrypt(phone));
         PayContactsManagement contactsManagement = this.getOne(queryWrapper);
         if (ObjectUtils.isEmpty(contactsManagement)) {
             throw new JeroBootException("用户不存在");
         }
-        String passwordEncode = PasswordUtil.encrypt(contactsManagement.getPhone(), password, contactsManagement.getSalt());
+        String managementPhone = contactsManagement.getPhone();
+        String passwordEncode = PasswordUtil.encrypt(PasswordUtil.decrypt(managementPhone), password, contactsManagement.getSalt());
         companyLoginVO.setPassword(passwordEncode);
+        companyLoginVO.setPhone(managementPhone);
         payContactsManagementMapper.forgetPassword(companyLoginVO);
-        redisUtil.del("_verification:_phone:" + companyLoginVO.getPhone());
+        redisUtil.del("_verification:_phone:" + phone);
     }
 }
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
index 83c177d8..05f00277 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
@@ -611,6 +611,7 @@ public class LoginController {
             throw new JeroBootException("手机号不存在");
         }
         sysBaseAPI.sendVerificationCode(phone,"2",null,null);
-        return Result.OK();
+        String string = redisUtil.get("_verification:_phone:" + PasswordUtil.decrypt(phone)).toString();
+        return Result.OK(string);
     }
 }
\ No newline at end of file
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index b76d5fef..56b4e8be 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -507,7 +507,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			throw new JeroBootException("新密码和确认密码不一致,请重新输入");
 		}
 		LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(SysUser::getPhone, phone);
+		queryWrapper.eq(SysUser::getPhone, PasswordUtil.encrypt(phone));
 		SysUser sysUser = this.getOne(queryWrapper);
 		if (ObjectUtils.isEmpty(sysUser)) {
 			throw new JeroBootException("用户不存在");