shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-04-09 00:37:52 +08:00
parent b42ffc27df
commit 8960a5f8a7
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java
View File

@@ -67,12 +67,18 @@ public class CurrentUserFullInfoVo {
* 居住地
*/
@Schema(description = "居住地")
private String residence;
private String residenceCode;
@Schema(description = "居住地名称")
private String residenceName;
@Schema(description = "居住地城市")
private String residenceCityName;
/**
* 户籍地
*/
@Schema(description = "户籍地")
private String address;
private String addressCode;
@Schema(description = "户籍地名称")
private String addressName;
/**
* 学历
*/

9
ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
View File

@@ -139,6 +139,7 @@ public class CurrentUserManager {
}
if(StringUtils.isNotEmpty(req.getAddressCode())){
AreaCode areaCode = areaCodeService.getById(req.getAddressCode());
updateUser.setAddressCode(req.getAddressCode());
updateUser.setAddressName(areaCode.getName());
}
if(StringUtils.isNotEmpty(req.getResidenceCode())){
@@ -252,12 +253,13 @@ public class CurrentUserManager {
User updateUser = BeanConvertUtil.convertTo(req, User::new);
if(StringUtils.isNotEmpty(req.getAddressCode())){
AreaCode areaCode = areaCodeService.getById(req.getAddressCode());
updateUser.setAddressName(areaCode.getName());
updateUser.setAddressCode(req.getAddressCode());
updateUser.setAddressName(areaCode.getFullname());
}
if(StringUtils.isNotEmpty(req.getResidenceCode())){
AreaCode areaCode = areaCodeService.getById(req.getResidenceCode());
updateUser.setResidenceName(req.getResidenceCode());
updateUser.setResidenceName(areaCode.getName());
updateUser.setResidenceCode(req.getResidenceCode());
updateUser.setResidenceName(areaCode.getFullname());
updateUser.setResidenceCityName(areaCode.getPname());
}
updateUser.setId(userId);
@@ -266,6 +268,7 @@ public class CurrentUserManager {
UserInfo updateUserInfo = BeanConvertUtil.convertTo(req, UserInfo::new);
UserInfo userInfo = userInfoService.getByUserId(userId);
updateUserInfo.setId(userInfo.getId());
updateUserInfo.setUpdateTime(LocalDateTime.now());
userInfoService.updateById(updateUserInfo);
}