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

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

src/main/java/com/fdkankan/scene/service/impl/SceneResourceServiceImpl.java

@@ -10,6 +10,8 @@ import com.fdkankan.scene.entity.SceneResourceCooperation;
 import com.fdkankan.scene.mapper.ISceneResourceMapper;
 import com.fdkankan.scene.service.ISceneResourceCooperationService;
 import com.fdkankan.scene.service.ISceneResourceService;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +45,7 @@ public class SceneResourceServiceImpl extends ServiceImpl<ISceneResourceMapper,
             throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
         }
         if(countV4Resource == sceneResourceCooperationList.size()){//如果协作菜单数量与资源数量相同，则返回空，由前端判断当前用户拥有所有该场景编辑权限
-            return null;
+            return new ArrayList<>();
         }
 
         List<Long> sceneResourceIdList = sceneResourceCooperationList.stream()