Skip to content

C
cloud-platform
Commit 4fd885bb authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master-modify-cutAmount' into dev

parents 83dda54e 88ef8ddc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
View file @ 4fd885bb
...@@ -1024,8 +1024,10 @@ public class AppPermissionService { ...@@ -1024,8 +1024,10 @@ public class AppPermissionService {
} }
Map<Integer, AppUserDetail> userIdAndAppUserDetail = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(Arrays.asList(appUserLogin.getId())); Map<Integer, AppUserDetail> userIdAndAppUserDetail = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(Arrays.asList(appUserLogin.getId()));
AppUserDetail appUserDetail = userIdAndAppUserDetail.get(appUserLogin.getId()); AppUserDetail appUserDetail = userIdAndAppUserDetail.get(appUserLogin.getId());
imiVo.setNickname(appUserDetail.getNickname()); if (appUserDetail != null) {
imiVo.setHeadimgurl(appUserDetail.getHeadimgurl()); imiVo.setNickname(appUserDetail.getNickname());
imiVo.setHeadimgurl(appUserDetail.getHeadimgurl());
}
return imiVo; return imiVo;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment