feat(Wiki历史版本):历史版本列表用户名显示昵称
This commit is contained in:
parent
e48ce7f4b0
commit
143fa631ce
|
@ -165,16 +165,17 @@ public class WikiService {
|
|||
}
|
||||
WikiRevisionsVo wikiRevisionsVo = JSON.parseObject(httpClientResult.getContent(), WikiRevisionsVo.class);
|
||||
wikiRevisionsVo.getCommits().forEach(commit -> {
|
||||
commit.getCommiter().setImage_url(userService.getRemoteUserLogoByUserLogin(commit.getCommiter().getName()));
|
||||
User commitUser = userService.getUserByLogin(commit.getCommiter().getName());
|
||||
if(commitUser != null){
|
||||
commit.getCommiter().setName(StringUtils.isEmpty(commitUser.getNickname()) ? commitUser.getLogin() : commitUser.getNickname());
|
||||
}
|
||||
commit.getCommiter().setImage_url(userService.getRemoteUserLogoByUserLogin(commit.getCommiter().getName()));
|
||||
|
||||
commit.getAuthor().setImage_url(userService.getRemoteUserLogoByUserLogin(commit.getAuthor().getName()));
|
||||
User authorUser = userService.getUserByLogin(commit.getAuthor().getName());
|
||||
if(authorUser != null){
|
||||
commit.getAuthor().setName(StringUtils.isEmpty(authorUser.getNickname()) ? authorUser.getLogin() : authorUser.getNickname());
|
||||
}
|
||||
commit.getAuthor().setImage_url(userService.getRemoteUserLogoByUserLogin(commit.getAuthor().getName()));
|
||||
});
|
||||
|
||||
return wikiRevisionsVo;
|
||||
|
|
Loading…
Reference in New Issue