获取自定义机构权限

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -204,12 +204,12 @@ public class UserServiceImpl implements UserService {
                 }
             }
         }
-        loginUser.setProgramItemList(programItemList);
-        */
 
+        */
 
 
 
+        loginUser.setProgramItemList(programItems);
         loginUser.setName(user.getUsername());
         loginUser.setId(user.getId());
         loginUser.setUsername(user.getUsername());
@@ -250,12 +250,13 @@ public class UserServiceImpl implements UserService {
             getOrg(user.getDeptOrgId(),allOrgs,programItemList);
 
         }else if(permissionType==5){
-            programItemList= userMapper.findOrgRole(user);
+            programItemList.addAll( userMapper.findOrgRole(user));
             programItemList.forEach(programItem -> {
                 programItem.setCode(user.getTenantId());
             });
         }
 
+
     }
     private    Map<Integer, List<Org>> getAllOrgs(String orgType,String tenantId){
         Org org=new Org();