|
|
@@ -45,16 +45,14 @@ public class RoleServiceImpl implements RoleService {
|
|
|
@Override
|
|
|
public Set<Role> getRolesByExist() {
|
|
|
Long enuu = SystemSession.getUser().getEnterprise().getUu();
|
|
|
- List<User> users = userDao.findByEnUU(enuu);
|
|
|
- Set<Role> roles = new HashSet<>();
|
|
|
- for (User u : users) {
|
|
|
- for (Role role : u.getRoles()) {
|
|
|
- if (role.getEnUU().equals(enuu)) {
|
|
|
- roles.add(role);
|
|
|
- }
|
|
|
+ List<Role> roles = roleDao.findByEnUU(enuu);
|
|
|
+ Set<Role> existRoles = new HashSet<>();
|
|
|
+ for (Role role : roles) {
|
|
|
+ if (roleDao.findCountUserByRoleId(role.getId()) > 0) {
|
|
|
+ existRoles.add(role);
|
|
|
}
|
|
|
}
|
|
|
- return roles;
|
|
|
+ return existRoles;
|
|
|
}
|
|
|
|
|
|
@Override
|