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

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud

Browse Source 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
This commit is contained in:
YunaiV
2025-12-28 10:22:38 +08:00
parent cad6da432b 0f27c0aa72
commit 7739c2a35d
41 changed files with 2853 additions and 1396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yudao-module-member/yudao-module-member-server/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")