修改

xuhy

2024-12-13 86e0beb515365c938348ec09290dfe4765e2b3ae

 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) ;
    }