dcs há 1 ano atrás
pai
commit
c09fbcab0d

+ 6 - 4
virgo.manager/src/main/java/com/bosshand/virgo/service/UserService.java

@@ -10,9 +10,7 @@ import com.bosshand.virgo.core.model.MgrUserRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class UserService {
@@ -57,17 +55,21 @@ public class UserService {
 
     public List<MgrUser> listUser(long organizationId, long roleId) {
         List<MgrUserRole> list = mgrUserRoleDao.getOrganizationId(organizationId);
+        Map<Long, String> map = new HashMap<>();
         List<Long> userIds = new ArrayList<>();
         for (MgrUserRole mur : list) {
             if (mur.getRoles() != null) {
                 List<String> ll = new ArrayList<>(Arrays.asList(mur.getRoles().split(",")));
                 if (ll.contains(String.valueOf(roleId))) {
                     userIds.add(mur.getUserId());
+                    map.put(mur.getUserId(), mur.getResources());
                 }
             }
         }
         if (userIds.size() > 0) {
-            return mgrUserDao.getIds(userIds);
+            List<MgrUser> userList = mgrUserDao.getIds(userIds);
+            userList.forEach(ls -> ls.setResources(map.get(ls.getId())));
+            return userList;
         }
         return new ArrayList<>();
     }