|
@@ -102,7 +102,8 @@ public class SceneService implements ISceneService {
|
|
if(record.getSceneType().equals("4dkankan")){
|
|
if(record.getSceneType().equals("4dkankan")){
|
|
record.setStatus(setLaserStatus(record.getStatus(),record.getPayStatus()));
|
|
record.setStatus(setLaserStatus(record.getStatus(),record.getPayStatus()));
|
|
}
|
|
}
|
|
- record.setType(toFusionType(setSceneType(record.getSceneSource(),record.getSceneType())));
|
|
|
|
|
|
+ Integer i = setSceneType(record.getSceneSource(), record.getSceneType());
|
|
|
|
+ record.setType(toFusionType(i));
|
|
if(collect.contains(record.getName())){
|
|
if(collect.contains(record.getName())){
|
|
record.setInFusion(true);
|
|
record.setInFusion(true);
|
|
}
|
|
}
|