Merge branch 'master' of http://192.168.0.115:3000/lyhzzz/4dkankan-center-user

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

@@ -383,7 +383,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
-        List<SceneVo> folderList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());
+        List<SceneVo> folderList = sceneVoPage.getRecords().parallelStream()
+                .peek(entity -> {
+                    // 当计算时，返回给前端的状态为计算中
+                    if (entity.getStatus() == -1) {
+                        entity.setStatus(0);
+                    } else if (entity.getStatus() == 500) {
+                        entity.setStatus(-1);
+                    }
+                })
+                .filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());
         Long totalSceneNum = 0L;
         if(folderList.size() >0){
             List<Long> folderIds = folderList.parallelStream().map(SceneVo::getId).collect(Collectors.toList());