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