Bläddra i källkod

修改logo生成逻辑

tianboguang 2 år sedan
förälder
incheckning
142f6fc454

+ 3 - 1
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -272,7 +272,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             this.writeSceneJson(sceneCode, videosJson,sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
 
-            String qrLogo = !ObjectUtils.isEmpty(company) && !ObjectUtils.isEmpty(company.getQrLogo()) ? company.getQrLogo() : fYunFileConfig.getHost().concat(sceneEditInfoExt.getShareLogoImg());
+            String qrLogo = !ObjectUtils.isEmpty(company) && !ObjectUtils.isEmpty(company.getQrLogo()) ? company.getQrLogo() : null;
+
+            qrLogo = ObjectUtils.isEmpty(qrLogo) && !ObjectUtils.isEmpty(sceneEditInfoExt.getShareLogoImg()) ? fYunFileConfig.getHost().concat(sceneEditInfoExt.getShareLogoImg()) : null;
 
             createQrCode(sceneCode, scenePlusExt, qrLogo);