|
@@ -176,7 +176,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
|
|
|
|
|
|
for (SceneVo record : page.getRecords()) {
|
|
|
- if(param.getType() == null || param.getType() == 2 || param.getType() == 5){
|
|
|
+ if(param.getType() != null && ( param.getType() == 2 || param.getType() == 5)){
|
|
|
JSONObject ssObj = ssSceneMap.get(record.getNum());
|
|
|
if(ssObj!=null){
|
|
|
record.setSceneName(ssObj.getString("title"));
|