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; /** *

- * + * *

* * @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 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))); }