From 13c66d6b5b831c430a1aee2b72b89437cc2bff5a Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 3 Nov 2021 17:35:14 +0800
Subject: [PATCH] feat: There is no way the, tree

---
 .../da/slrs/sarResource/dao/TsResourceDao.java   |  2 ++
 .../service/impl/TsResourceServiceImpl.java      | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
index de959ae0..223bbb93 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarResource.dao;
 
 import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 import java.util.HashMap;
 import java.util.List;
@@ -14,6 +15,7 @@ import java.util.List;
  * @author zyl
  * @since 2021-06-30
  */
+@Repository
 public interface TsResourceDao extends BaseMapper<TsResource> {
 
     List<TsResource> queryMenuByDis(TsResource sarMenuEO);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
index d1e8776f..eda369a2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
@@ -151,6 +151,10 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
             tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide());
         }
         tsResourceQueryWrapper.isNull("PARENT_ID");
+        List<String> list = new ArrayList<>();
+        list.add("INLAND_STAND");
+        list.add("FOREIGN_STAND");
+        tsResourceQueryWrapper.notIn("SOR_DIVIDE",list);
         tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
         List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper);
         for(TsResource TsResource:TsResources){
@@ -181,7 +185,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
                 TsResources=dao.selectList(tsResourceQueryWrapper);
 
                 for(TsResource TsResource:TsResources){
-                    TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList)));
+                    TsResource.setChildren(recursionGetListChildren((tsResource.getSorDivide()),(TsResource),(getMenuIdList)));
                 }
             }
         }
@@ -287,14 +291,18 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
      * @param parent：父节点
      * @return List<TsResource>
      */
-    private List<TsResource> recursionGetListChildren(TsResource parent,List<String> getMenuIdList){
+    private List<TsResource> recursionGetListChildren(String sorDivide,TsResource parent,List<String> getMenuIdList){
         QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
         TsResourceQueryWrapper.eq("PARENT_ID",parent.getId());
-        TsResourceQueryWrapper.in("ID",getMenuIdList);
+        if(StringUtils.isNotBlank(sorDivide)){
+            if(!sorDivide.equals("INLAND_STAND") && !sorDivide.equals("FOREIGN_STAND")){
+                TsResourceQueryWrapper.in("ID",getMenuIdList);
+            }
+        }
         TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
         List<TsResource> children=dao.selectList(TsResourceQueryWrapper);
         for(TsResource TsResource:children){
-            TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList)));
+            TsResource.setChildren(recursionGetListChildren((sorDivide),(TsResource),(getMenuIdList)));
         }
         return children;
     }