21

src/main/java/com/fdkankan/ucenter/service/IScenePlusService.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface IScenePlusService extends IService<ScenePlus> {
 
-    Long getCountByUserId(Long userId, List<Integer> sceneSourceList);
+    Long getCountByUserId(Long userId, List<?> sceneSourceList);
 
     Long getCountByUserId(Long userId, Integer cameraType);
 

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

@@ -81,7 +81,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     private String sceneProNewUrl;
 
     @Override
-    public Long getCountByUserId(Long userId, List<Integer> sceneSourceList) {
+    public Long getCountByUserId(Long userId, List<?> sceneSourceList) {
         LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ScenePlus::getUserId, userId);
         wrapper.in(ScenePlus::getSceneSource, sceneSourceList);

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

@@ -423,6 +423,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(param.getFolderId() == null){
             List<String> sourceList = param.getSourceList();
             totalSceneNum = this.getCountByUserId(user.getId(),sourceList);
+            totalSceneNum += scenePlusService.getCountByUserId(user.getId(),sourceList);
         }else {
             totalSceneNum = folderSceneService.getCountByFolderAndSon(param.getFolderId());
         }