Browse Source

修改获取企业已有用户的角色的请求的实现

suntg 7 years ago
parent
commit
f8def93853

+ 6 - 8
src/main/java/com/uas/platform/b2c/common/account/service/impl/RoleServiceImpl.java

@@ -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