feat: There is no way the, tree

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java

@@ -103,4 +103,8 @@ public class TsResource extends BaseEntity {
     @TableField(exist = false)
     private String isFlow;
 
+    @ApiModelProperty(value = "树结构数据 区分 类型： 标准数据 tsr 技术系列 sarMs")
+    @TableField(exist = false)
+    private String treeType;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java

@@ -220,6 +220,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
         TsResources=dao.selectList(queryWrapper);
 
         for(TsResource resource:TsResources){
+            resource.setTreeType("tsr");
             QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
             TsResourceQueryWrapper.like("PARENT_IDS",resource.getId());
             TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
@@ -343,6 +344,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
         if(!tsResources.isEmpty()){
             tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList());
             tsResources.forEach(resource1 -> {
+                resource1.setTreeType("tsr");
                 resource1.setChildren(recursionGetListChildrenStand((resource1),(children)));
             });
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -66,6 +66,9 @@ public class SarStandardsInfoEOPage extends BasePage {
     private List<String> menuRoleList; //有权限的目录
     private String[] idlist;  //多个id
     private String menuId; //目录ID
+    private String treeType; // 树结构数据 区分 类型： 标准数据 tsr 技术系列 sarMs
+    private String sarMsType; // 树结构数据 技术系列 sarMs 过滤此目录之外数据
+    private String sarMsMenuId;
     private String rootMenuId;
     private String attrSearchStr;
     private String advanceSearchStr;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -221,6 +221,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Autowired
     private ITsResourceService iTsResourceService;
 
+    @Autowired
+    private ISarMenuStandardService iSarMenuStandardService;
+
     @Autowired
     private CreateStandMQService createStandMQService;
 
@@ -299,11 +302,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
         if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
-            QueryWrapper<TsResource> qw = new QueryWrapper<>();
+            String treeType = page.getTreeType();
+            QueryWrapper qw = new QueryWrapper<>();
             qw.eq("ID",page.getMenuId());
             qw.isNull("PARENT_ID");
             List<TsResource> children = iTsResourceService.list(qw);
-            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+            if(children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)){
                 List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
                 if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
                     page.setMenuRoleList(getMenuIdList);
@@ -314,6 +318,28 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 if (ids != null && !ids.isEmpty()) {
                     page.setMenuAllChildrenIdList(ids);
                 }
+            }else if(!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)){
+                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+                    page.setMenuRoleList(getMenuIdList);
+                } else {
+                    page.setMenuRoleList(null);
+                }
+                List<String> ids = iSarMenuStandardService.getChildMenuList(page.getMenuId());
+                if (ids != null && !ids.isEmpty()) {
+                    page.setMenuAllChildrenIdList(ids);
+                }
+            }else if(page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(page.getSarMsType()) && "filterSarMsMenu".equals(page.getSarMsType())){
+                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+                    page.setMenuRoleList(getMenuIdList);
+                } else {
+                    page.setMenuRoleList(null);
+                }
+                List<String> ids = iSarMenuStandardService.getChildMenuList(page.getSarMsMenuId());
+                if (ids != null && !ids.isEmpty()) {
+                    page.setMenuAllChildrenIdList(ids);
+                }
             }
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);