|
@@ -1411,7 +1411,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
HashMap<String,JSONObject> map = laserService.list(numList, sceneSource);
|
|
HashMap<String,JSONObject> map = laserService.list(numList, sceneSource);
|
|
|
laserMap.putAll(map);
|
|
laserMap.putAll(map);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
for (SceneVo record : page.getRecords()) {
|
|
for (SceneVo record : page.getRecords()) {
|
|
|
JSONObject ssObj = laserMap.get(record.getNum());
|
|
JSONObject ssObj = laserMap.get(record.getNum());
|
|
|
if(ssObj!=null){
|
|
if(ssObj!=null){
|
|
@@ -1424,6 +1423,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
record.setWebSite(null);
|
|
record.setWebSite(null);
|
|
|
}
|
|
}
|
|
|
record.setIsLaser(true);
|
|
record.setIsLaser(true);
|
|
|
|
|
+ record.setIsUpgrade(0);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return PageInfo.PageInfo(page);
|
|
return PageInfo.PageInfo(page);
|