Browse Source

场景协作菜单过滤掉v3菜单

dengsixing 1 year ago
parent
commit
3024add5ec

+ 4 - 1
src/main/java/com/fdkankan/scene/entity/SceneResource.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 场景资源表
  * </p>
  *
- * @author 
+ * @author
  * @since 2022-01-20
  */
 @Getter
@@ -49,6 +49,9 @@ public class SceneResource implements Serializable {
     @TableField("icon")
     private String icon;
 
+    @TableField("version")
+    private String version;
+
     /**
      * 资源描述
      */

+ 5 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -48,6 +48,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -236,7 +238,9 @@ public class SceneEditServiceImpl implements ISceneEditService {
             return sceneAuthVO;
         }
 
-        sceneAuthVO.setInclude(sceneResourceService.findByCooperationId(sceneCooperation.getId()));
+        List<SceneResource> sceneResourceList = sceneResourceService.findByCooperationId(sceneCooperation.getId());
+        List<SceneResource> v4SceneResourceList = sceneResourceList.stream().filter(v -> v.getVersion().equals("v4")).collect(Collectors.toList());
+        sceneAuthVO.setInclude(v4SceneResourceList);
 
         return sceneAuthVO;
     }