1

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

@@ -581,7 +581,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             totalSceneNum = folderSceneService.getCountByFolderAndSon(param.getFolderId());
         }else if(param.getIsObj() != null && param.getIsObj() ==1){
             if(param.getUserId()!= null){
-                totalSceneNum = this.getCountByLaserAndIsObj(param.getUserId());
+                totalSceneNum = this.getCountByLaserAndIsObj(param.getUserId(),Integer.valueOf(param.getSceneSource()));
             }
         }
         JSONObject jsonObject = new JSONObject();
@@ -590,19 +590,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return jsonObject;
     }
 
-    private Long getCountByLaserAndIsObj(Long userId) {
+    private Long getCountByLaserAndIsObj(Long userId,Integer sceneSource) {
         Long proCount = 0L;
         Long plusCount = 0L;
         LambdaQueryWrapper<ScenePro> proWr = new LambdaQueryWrapper<>();
         proWr.eq(ScenePro::getUserId,userId);
-        proWr.eq(ScenePro::getSceneSource,4);
+        proWr.eq(ScenePro::getSceneSource,sceneSource);
         proWr.eq(ScenePro::getIsObj,1);
         proWr.eq(ScenePro::getIsUpgrade,0);
         proCount = this.count(proWr);
 
         LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
         plusWr.eq(ScenePlus::getUserId,userId);
-        plusWr.eq(ScenePlus::getSceneSource,4);
+        plusWr.eq(ScenePlus::getSceneSource,sceneSource);
         List<ScenePlus> list = scenePlusService.list(plusWr);
         if(list.size() >0){
             List<Long> plusIds = list.stream().map(ScenePlus::getId).collect(Collectors.toList());