21

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

@@ -424,14 +424,14 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             folderList.addAll(sceneList);
         }
         sceneVoPage.setRecords(folderList);
-        if(param.getFolderId() == null && param.getIsObj()!=1){
+        if(param.getFolderId() == null && param.getIsObj() == null ){
             List<String> sourceList = param.getSourceList();
             totalSceneNum = this.getCountByUserId(user.getId(),sourceList);
             totalSceneNum += scenePlusService.getCountByUserId(user.getId(),sourceList);
             totalSceneNum += sceneService.getCountByUserId(user.getId());
         }else if(param.getFolderId() != null ){
             totalSceneNum = folderSceneService.getCountByFolderAndSon(param.getFolderId());
-        }else if(param.getIsObj() ==1){
+        }else if(param.getIsObj() != null && param.getIsObj() ==1){
             totalSceneNum = this.getCountByLaserAndIsObj(user.getId());
         }
         JSONObject jsonObject = new JSONObject();