Merge branch 'fixbug_0224' of http://git.gicdev.com/haoban3.0/haoban-manage3.0

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

@@ -265,7 +265,7 @@ public class WelcomeServiceImpl implements WelcomeService {
 
     private void assemblyMiniProgram(TabWelcome welcome, WelcomeDetailBO welcomeDetail) {
         TabHaobanFriendSetting friendSetting = friendSettingMapper.getByWxEnterpriseId(welcome.getWxEnterpriseId());
-        if (friendSetting.getFriendSettingType().equals(1)) {
+        if (Objects.isNull(friendSetting) || FriendSettingTypeEnum.TEXT_AND_MINI_PROGRAM.getCode().equals(friendSetting.getFriendSettingType())) {
             WelcomeMediaBO welcomeMediaBO = new WelcomeMediaBO();
             List<TabMiniprogramSetting> tabMiniprogramSettings = miniprogramSettingMapper.listMiniprogramSetting(welcome.getWxEnterpriseId());
             if (CollectionUtils.isNotEmpty(tabMiniprogramSettings)) {