lyhzzz 1 jaar geleden
bovenliggende
commit
b9fd68d4c9
1 gewijzigde bestanden met toevoegingen van 6 en 0 verwijderingen
  1. 6 0
      src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

+ 6 - 0
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -236,11 +236,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         HashMap<String, JSONObject> laserMap = new HashMap<>();
         if(param.getType() == 2 && StringUtils.isNotBlank(param.getSceneName())){
             laserMap = laserService.list(param.getSceneName(), 4);
+            if(laserMap.isEmpty()){
+                return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+            }
             param.setSceneName(null);
         }
         if(param.getType() == 6 && StringUtils.isNotBlank(param.getSceneName())){
             laserMap = laserService.list(param.getSceneName(), 5);
             param.setSceneName(null);
+            if(laserMap.isEmpty()){
+                return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+            }
         }
         if(!laserMap.isEmpty()){
             Set<String> keySet = laserMap.keySet();