|
@@ -1011,7 +1011,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
}
|
|
}
|
|
|
List<String> lNumList2 = sceneProList.stream().filter(e -> CameraUtils.isQjkk(e.getSceneSource())).map(ScenePro::getNum).collect(Collectors.toList());
|
|
List<String> lNumList2 = sceneProList.stream().filter(e -> CameraUtils.isQjkk(e.getSceneSource())).map(ScenePro::getNum).collect(Collectors.toList());
|
|
|
if(!lNumList2.isEmpty()){
|
|
if(!lNumList2.isEmpty()){
|
|
|
- qjkkNumList.addAll(lNumList);
|
|
|
|
|
|
|
+ qjkkNumList.addAll(lNumList2);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1028,7 +1028,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
|
|
|
|
|
List<String> lNumList2 = scenePlusList.stream().filter(e -> CameraUtils.isQjkk(e.getSceneSource())).map(ScenePlus::getNum).collect(Collectors.toList());
|
|
List<String> lNumList2 = scenePlusList.stream().filter(e -> CameraUtils.isQjkk(e.getSceneSource())).map(ScenePlus::getNum).collect(Collectors.toList());
|
|
|
if(!lNumList2.isEmpty()){
|
|
if(!lNumList2.isEmpty()){
|
|
|
- qjkkNumList.addAll(lNumList);
|
|
|
|
|
|
|
+ qjkkNumList.addAll(lNumList2);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|