Merge branch 'feature-44079-dsx-20240429' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

src/main/java/com/fdkankan/scene/entity/SceneResource.java

@@ -49,6 +49,9 @@ public class SceneResource implements Serializable {
     @TableField("icon")
     private String icon;
 
+    @TableField("version")
+    private String version;
+
     /**
      * 资源描述
      */

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;
@@ -227,7 +229,9 @@ public class SceneEditServiceImpl implements ISceneEditService {
         //权限控制完后判断若是协作账号，获取协作权限
         SceneCooperation sceneCooperation = sceneCooperationService.getByNum(num);
         if(Objects.nonNull(sceneCooperation)){
-            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;