Merge remote-tracking branch 'origin/master'

This commit is contained in:
tangw 2026-01-15 15:18:36 +08:00
commit ab838e43ba

View File

@ -237,6 +237,10 @@ public class SysRoleController extends BaseController {
@GetMapping("/getUserName") @GetMapping("/getUserName")
public AjaxResult selectUserByUserName(String username) { public AjaxResult selectUserByUserName(String username) {
SysUser sysUser = userService.selectUserByUserName(username); SysUser sysUser = userService.selectUserByUserName(username);
return AjaxResult.success(sysUser.getNickName()); String nickName = "";
if(sysUser != null) {
nickName = sysUser.getNickName();
}
return AjaxResult.success(nickName);
} }
} }