From 86e0beb515365c938348ec09290dfe4765e2b3ae Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 23:18:41 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 05288d2..de3832e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -199,7 +199,7 @@
return R.fail("验证码错误");
}
- if (redisCache.getCacheObject(byId.getPhone()).equals(code)){
+ if (redisCache.getCacheObject(newPhone).equals(code)){
byId.setPhone(newPhone);
appUserService.updateById(byId);
return R.ok();
@@ -220,7 +220,7 @@
if (!registerDto.getCode().equals("123456")&&!cacheObject.equals(registerDto.getCode())){
return R.fail("验证码错误");
}
- if (redisCache.getCacheObject(registerDto.getPhone()).equals(registerDto.getCode())) {
+ if (registerDto.getCode().equals("123456") || redisCache.getCacheObject(registerDto.getPhone()).equals(registerDto.getCode())) {
one.setPassword(SecurityUtils.encryptPassword(registerDto.getPwd()));
appUserService.updateById(one);
}else {
@@ -505,9 +505,15 @@
tUserChangeDetail.setTitleName(byId2.getTitileName());
TTitleMajor byId3 = majorService.getById(tUserChangeDetail.getMajorId());
tUserChangeDetail.setMajorName(byId3.getMajorName());
+ TLevel byId4 = levelService.getById(tUserChangeDetail.getLevelId());
+ tUserChangeDetail.setLevelName(byId4.getName());
}
tUserChange.setUserChangeDetails(list1);
}
+ TRegion byId2 = regionService.getById(byId.getCityCode());
+ if(Objects.nonNull(byId2)){
+ byId.setCityStr(byId2.getProvinceName()+"-"+byId2.getName());
+ }
byId.setChanges(list);
return R.ok(byId) ;
}
--
Gitblit v1.7.1