Skip to content

S
smart_gov_platform
Commit e6b69eaf authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents dde01f6e db105c69
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 13 deletions
portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java
View file @ e6b69eaf
...@@ -74,19 +74,21 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE ...@@ -74,19 +74,21 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
@Override @Override
protected void findAfter(UserEntity entity, PageInfo pageInfo, Context context, List<UserEntity> list) throws AppException { protected void findAfter(UserEntity entity, PageInfo pageInfo, Context context, List<UserEntity> list) throws AppException {
Map<Long, String> roleMap = roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getName())); if (CollectionUtils.isNotEmpty(list)) {
List<Long> userIdList = list.stream().map(item -> item.getId()).collect(Collectors.toList()); Map<Long, String> roleMap = roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getName()));
RoleUserQuery roleUserQuery = new RoleUserQuery(); List<Long> userIdList = list.stream().map(item -> item.getId()).collect(Collectors.toList());
roleUserQuery.setUserIdList(userIdList); RoleUserQuery roleUserQuery = new RoleUserQuery();
Map<Long, List<RoleUserEntity>> collect = roleUserService.find(roleUserQuery).stream().collect(Collectors.groupingBy(item -> item.getUserId())); roleUserQuery.setUserIdList(userIdList);
list.stream().forEach(item->{ Map<Long, List<RoleUserEntity>> collect = roleUserService.find(roleUserQuery).stream().collect(Collectors.groupingBy(item -> item.getUserId()));
if(!ObjectUtils.isEmpty(collect.get(item.getId()))){ list.stream().forEach(item -> {
item.setRoleId(collect.get(item.getId()).stream().map(RoleUserEntity::getRoleId).map(String::valueOf).collect(Collectors.joining(","))); if (!ObjectUtils.isEmpty(collect.get(item.getId()))) {
item.setRoleName(collect.get(item.getId()).stream().map(m->roleMap.get(m.getRoleId())).filter(f->f!=null).collect(Collectors.joining(","))); item.setRoleId(collect.get(item.getId()).stream().map(RoleUserEntity::getRoleId).map(String::valueOf).collect(Collectors.joining(",")));
} item.setRoleName(collect.get(item.getId()).stream().map(m -> roleMap.get(m.getRoleId())).filter(f -> f != null).collect(Collectors.joining(",")));
}); }
super.findAfter(entity, pageInfo, context, list); });
} super.findAfter(entity, pageInfo, context, list);
}
}
private void doHandlerUser(UserEntity entity) throws AppException { private void doHandlerUser(UserEntity entity) throws AppException {
if (StringUtils.isNotEmpty(entity.getLoginPwd())) { if (StringUtils.isNotEmpty(entity.getLoginPwd())) {
......
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