From 59e44f1e7eabaacebc83e6be646287879d75d293 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 25 Jan 2022 22:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BD=93=E7=B3=BB=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA"=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E6=94=B6=E8=97=8F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/slrs/sarResource/entity/TsResource.java   | 7 +++++--
 .../sarResource/service/impl/TsResourceServiceImpl.java  | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java
index 5fef685e..d0232950 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zyl
@@ -65,7 +65,7 @@ public class TsResource extends BaseEntity {
     @ApiModelProperty(value = "排序序号")
     @TableField("DISPLAY_SEQ")
     private Integer displaySeq;
-    
+
 
     @ApiModelProperty(value = "是否有效")
     @TableField("VALID_FLAG")
@@ -100,4 +100,7 @@ public class TsResource extends BaseEntity {
     @TableField(exist=false)
     private String userId;
 
+    @TableField(exist = false)
+    private String isFlow;
+
 }
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 cf74720e..95138325 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
@@ -224,6 +224,15 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
             TsResourceQueryWrapper.like("PARENT_IDS",resource.getId());
             TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
             List<TsResource> children=dao.selectList(TsResourceQueryWrapper);
+
+            /**
+             * 入库流程去除我的收藏 flow
+             */
+            if ( tsResource.getIsFlow()!=null && "flow".equals(tsResource.getIsFlow())){
+                children=children.stream()
+                        .filter(item->!"我的收藏".equals(item.getMenuName()))
+                        .collect(Collectors.toList());
+            }
             resource.setChildren(recursionGetListChildrenStand((resource),(children)));
         }