|
@@ -256,6 +256,7 @@ public class CommonServiceImpl implements ICommonService {
|
|
|
Long userId = null;
|
|
|
String websize = "";
|
|
|
String title = "";
|
|
|
+ Integer sceneSource = null;
|
|
|
ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
|
|
|
if(Objects.isNull(scenePlus)){
|
|
|
ScenePro scenePro = sceneProService.getByNum(num);
|
|
@@ -265,11 +266,13 @@ public class CommonServiceImpl implements ICommonService {
|
|
|
userId = scenePro.getUserId();
|
|
|
websize = scenePro.getWebSite();
|
|
|
title = scenePro.getSceneName();
|
|
|
+ sceneSource = scenePro.getSceneSource();
|
|
|
}else{
|
|
|
userId = scenePlus.getUserId();
|
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
websize = scenePlusExt.getWebSite();
|
|
|
title = scenePlus.getTitle();
|
|
|
+ sceneSource = scenePlus.getSceneSource();
|
|
|
}
|
|
|
|
|
|
if(Objects.isNull(userId)){
|
|
@@ -288,7 +291,7 @@ public class CommonServiceImpl implements ICommonService {
|
|
|
}
|
|
|
websize += "&lang=" + lang;
|
|
|
if(("standar".equals(type))
|
|
|
- && (scenePlus.getSceneSource() == SceneSource.JG.code() || scenePlus.getSceneSource() == SceneSource.SG.code())){
|
|
|
+ && (sceneSource == SceneSource.JG.code() || sceneSource == SceneSource.SG.code())){
|
|
|
websize = String.format(laserUrl, num, lang);
|
|
|
}
|
|
|
|