bug

src/main/java/com/huiju/estateagents/service/impl/TaRoleServiceImpl.java

 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaRoleService;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
     @Autowired
     TaRoleButtonMapper taRoleButtonMapper;
 
+    @Autowired
+    private TaAdvancedControllerMapper taAdvancedControllerMapper;
+
+    @Autowired
+    private SysAdvancedConfigRelationMapper sysAdvancedConfigRelationMapper;
+
     @Override
     public List<TaRole> getRolesByUser(Integer userId) {
         return taRoleMapper.getRolesByUser(userId);
         QueryWrapper<TaRoleMenu> taRoleMenuQuery= new QueryWrapper<>();
         taRoleMenuQuery.eq("role_id",id);
        List<TaRoleMenu> taRoleMenusList = taRoleMenuMapper.selectList(taRoleMenuQuery);
+
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        sysAdvancedConfigRelationQueryWrapper.eq("target_type", CommConstant.ADVANCED_TYPE_MENU);
+        sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
+        List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
+
        // 同过menu_id查询当前菜单
          List<SysMenu> sysMenuList = new ArrayList<>();
         for (TaRoleMenu taRoleMenu :taRoleMenusList){
             SysMenu sysMenu = sysMenuMapper.selectById(taRoleMenu.getMenuId());
             sysMenuList.add(sysMenu);
-
+            for (SysAdvancedConfigRelation sysAdvancedConfigRelation : sysAdvancedConfigRelations){
+                if (taRoleMenu.getMenuId().equals(Integer.valueOf(sysAdvancedConfigRelation.getTargetId()))){
+                    sysMenuList.remove(sysMenu);
+                }
+            }
         }
         // 查询按钮
         QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();