1

src/main/java/com/fdkankan/ucenter/service/impl/SceneCooperationServiceImpl.java

@@ -514,7 +514,7 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
         numList1.addAll(numList2);
 
 
-        if(StringUtils.isBlank(sceneType) && !collect1.isEmpty() && !collect2.isEmpty()){
+        if(StringUtils.isBlank(sceneType) && ( !collect1.isEmpty() || !collect2.isEmpty())){
             List<String> newList = collect1.stream().filter(e->e.getIsObj() == 1).map(ScenePro::getNum).collect(Collectors.toList());
             List<Long> ids = collect2.stream().map(ScenePlus::getId).collect(Collectors.toList());
             HashMap<Long, ScenePlusExt> byPlusIds = scenePlusExtService.getByPlusIds(ids);