Browse Source

Merge branch 'lyh-bug-increment-exp' into test

lyhzzz 2 years ago
parent
commit
88c29e8355

+ 3 - 5
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

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