1

src/main/java/com/fdkankan/ucenter/controller/DeviceSceneController.java

@@ -39,7 +39,7 @@ public class DeviceSceneController extends BaseController {
         param.setHasFolder(0);
         JSONObject data = sceneProService.newList(param, null);
         JSONObject pageInfo = data.getJSONObject("pageInfo");
-        pageInfo.put("sceneNum",data.getInteger("sceneNum"));
+        pageInfo.put("sceneNum",pageInfo.getInteger("total"));
         return Result.success(pageInfo);
     }
 

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

@@ -568,9 +568,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 totalSceneNum = this.getCountByLaserAndIsObj(param.getUserId());
             }
         }
-        if(totalSceneNum == 0 && sceneVoPage.getTotal() !=0){
-            totalSceneNum = sceneVoPage.getTotal();
-        }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("pageInfo",PageInfo.PageInfo(sceneVoPage));
         jsonObject.put("sceneNum",totalSceneNum);