浏览代码

修改logo生成逻辑

tianboguang 2 年之前
父节点
当前提交
142f6fc454
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

+ 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);
             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);
             createQrCode(sceneCode, scenePlusExt, qrLogo);