getUserByRoleEnumAndAreaId
This commit is contained in:
@@ -106,6 +106,9 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
|
|||||||
}
|
}
|
||||||
if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){
|
if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){
|
||||||
// 按工号排序后放入redis
|
// 按工号排序后放入redis
|
||||||
|
authWarRegionUserIdList = authWarRegionUserIdList.stream()
|
||||||
|
.sorted((a, b) -> a.compareTo(b))
|
||||||
|
.collect(Collectors.toList());
|
||||||
redisUtilPool.listPushTail(investmentManagerKey, authWarRegionUserIdList.toArray(new String[authWarRegionUserIdList.size()]));
|
redisUtilPool.listPushTail(investmentManagerKey, authWarRegionUserIdList.toArray(new String[authWarRegionUserIdList.size()]));
|
||||||
suitableUserId = redisUtilPool.rpopStr(investmentManagerKey);
|
suitableUserId = redisUtilPool.rpopStr(investmentManagerKey);
|
||||||
}else {
|
}else {
|
||||||
@@ -139,7 +142,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
|
|||||||
}
|
}
|
||||||
List<Long> roleIdList = roleIds.stream().map(a -> Long.valueOf(a)).collect(Collectors.toList());
|
List<Long> roleIdList = roleIds.stream().map(a -> Long.valueOf(a)).collect(Collectors.toList());
|
||||||
List<EnterpriseUserRole> enterpriseUserRoleList = sysRoleMapper.getUserIdListByRoleIdList(roleIdList);
|
List<EnterpriseUserRole> enterpriseUserRoleList = sysRoleMapper.getUserIdListByRoleIdList(roleIdList);
|
||||||
enterpriseUserRoleList = enterpriseUserRoleList.stream().filter(o -> authRegionUserIdList.contains(o.getUserId())).collect(Collectors.toList());
|
enterpriseUserRoleList = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().filter(o -> authRegionUserIdList.contains(o.getUserId())).collect(Collectors.toList());
|
||||||
Map<String, List<String>> enterpriseUserRoleMap = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().collect(Collectors.groupingBy(EnterpriseUserRole::getRoleId, Collectors.mapping(k->k.getUserId(), Collectors.toList())));
|
Map<String, List<String>> enterpriseUserRoleMap = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().collect(Collectors.groupingBy(EnterpriseUserRole::getRoleId, Collectors.mapping(k->k.getUserId(), Collectors.toList())));
|
||||||
return enterpriseUserRoleMap;
|
return enterpriseUserRoleMap;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user