提交代码

hai-bweb/src/main/java/com/bweb/controller/HighMerchantStoreController.java

@@ -128,7 +128,7 @@ public class HighMerchantStoreController {
             if (highMerchantStore.getType().equals(1) && StringUtils.isBlank(highMerchantStore.getStoreLogo())) {
                 highMerchantStore.setStoreLogo(CommonSysConst.getSysConfig().getGasDefaultOilStationImg());
             }
-            if (highMerchantStore.getSourceType() == 7) {
+            if (highMerchantStore.getSourceType() != null && highMerchantStore.getSourceType() == 7) {
                 highMerchantStore.setStoreLogo(CommonSysConst.getSysConfig().getFileUrl() + highMerchantStore.getStoreLogo());
             }
             highMerchantStore.setCreateTime(new Date());