|
@@ -304,13 +304,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
Long space = 0L;
|
|
|
if (list != null && list.size() > 0){
|
|
|
for (SimpleSceneVo scenePro : list){
|
|
|
- if(scenePro.getSpace() > beyondSpace){
|
|
|
+ Long sceneSpace = scenePro.getSpace()== null ? 0 : scenePro.getSpace();
|
|
|
+ if (accumulateSpace + sceneSpace > beyondSpace){
|
|
|
continue;
|
|
|
}
|
|
|
- accumulateSpace += scenePro.getSpace()== null ? 0 : scenePro.getSpace();
|
|
|
- if (accumulateSpace > beyondSpace){
|
|
|
- break;
|
|
|
- }
|
|
|
+ accumulateSpace += sceneSpace;
|
|
|
space += scenePro.getSpace();
|
|
|
lockedIds.add(scenePro.getId());
|
|
|
}
|