|
|
@@ -224,26 +224,7 @@ public class UserServiceImpl implements UserService {
|
|
|
}
|
|
|
if (roleId != null){
|
|
|
//过滤 角色信息
|
|
|
- List<Long> usersId2 = new ArrayList(Arrays.asList(new Object[usersId.size()]));
|
|
|
- Collections.copy(usersId2,usersId);
|
|
|
- for (Long id : usersId){
|
|
|
- User user = userDao.findOne(id);
|
|
|
- int status = 0;
|
|
|
- for (Role role : user.getRoles()){
|
|
|
- if (role.getId().equals(roleId)){
|
|
|
- status++;
|
|
|
- }
|
|
|
- }
|
|
|
- if (status == 0){
|
|
|
- for(Long x:usersId2){
|
|
|
- if(x.equals(id)) {
|
|
|
- usersId2.remove(x);
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- usersId = usersId2;
|
|
|
+ usersId = userDao.findUserByRoleAndUsers(roleId,usersId.toArray(new Long[0]));
|
|
|
}
|
|
|
|
|
|
final List<Long> users = usersId;
|