diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java index 6b5cf81..e681653 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java @@ -255,7 +255,8 @@ public class CurrentUserManager { AreaCode areaCode = areaCodeService.getById(req.getResidenceCode()); updateUser.setResidenceCode(req.getResidenceCode()); updateUser.setResidenceName(areaCode.getFullname()); - updateUser.setResidenceCityName(areaCode.getPname()); + updateUser.setResidenceCityName(areaCode.getCityName()); + updateUser.setResidenceCityCode(areaCode.getCityCode()); } if(req.getBirthday() != null){ updateUser.setAge(AgeUtil.getAge(req.getBirthday())); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java index b806ee1..763fe53 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java @@ -164,7 +164,7 @@ public class UserServiceImpl extends ServiceImpl implements Use } UserAuth userAuth = userAuthService.getByUserId(userId); User user = this.getById(userId); - return ShowAvatarUtil.showAvatar(user.getOpenVip(),userAuth.getCarAuth()==1, avatar); + return ShowAvatarUtil.showAvatar(user.getOpenVip(),AuditEnum.SUCCESS.getCode().equals(userAuth.getCardNumAuth()), avatar); } @Override @@ -249,7 +249,7 @@ public class UserServiceImpl extends ServiceImpl implements Use Long userId = LoginHelper.getUserId(); if(userId != null){ UserAuth userAuth = userAuthService.getByUserId(userId); - card = userAuth != null && AuditEnum.SUCCESS.getCode().equals(userAuth.getCarAuth()); + card = userAuth != null && AuditEnum.SUCCESS.getCode().equals(userAuth.getCardNumAuth()); User user = this.getById(userId); vip = user.getOpenVip(); } @@ -289,7 +289,7 @@ public class UserServiceImpl extends ServiceImpl implements Use Long userId = LoginHelper.getUserId(); if(userId != null){ UserAuth userAuth = userAuthService.getByUserId(userId); - card = userAuth != null && AuditEnum.SUCCESS.getCode().equals(userAuth.getCarAuth()); + card = userAuth != null && AuditEnum.SUCCESS.getCode().equals(userAuth.getCardNumAuth()); User user = this.getById(userId); vip = user.getOpenVip(); }