gitee/ruoyi-vue-pro
1
0
Fork 0
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git synced 2026-03-22 05:07:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

Browse Source 
# Conflicts:
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
This commit is contained in:
YunaiV
2025-12-25 22:28:27 +08:00
parent 769302cec5 97ae1766e8
commit 7c150f080c
29 changed files with 1410 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
View File

@@ -82,7 +82,17 @@ public class MemberUserController {
@PreAuthorize("@ss.hasPermission('member:user:query')")
public CommonResult<MemberUserRespVO> getUser(@RequestParam("id") Long id) {
MemberUserDO user = memberUserService.getUser(id);
return success(MemberUserConvert.INSTANCE.convert03(user));
if (user == null) {
return success(null);
}
MemberUserRespVO userVO = MemberUserConvert.INSTANCE.convert03(user);
if (user.getLevelId() != null) {
MemberLevelDO level = memberLevelService.getLevel(userVO.getId());
if (level != null) {
userVO.setLevelName(level.getName());
}
}
return success(userVO);
}
@GetMapping("/page")