Merge branch 'refs/heads/feature-hongshu' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -95,7 +95,8 @@ public enum NoticeMessageTypeEnum {
 
     CASH_APPLY_OFFLINE_SUCCESS_NOTIFY(7003,"提现通知", NoticeMessageCategoryTypeEnum.OTHER.getType(),"cash_apply_offline_success_notify","/pages/route/index?pageType=","hbapp_withdraw_list","cashApplyOfflineSuccessNotify","haobanNotice"),
 
-    AUTHORIZED_LOGIN_NOTIFY(8001,"账号授权通知", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"authorized_login_notify","/pages/route/index?pageType=","hbapp_video_auth","authorizedLoginNotify","haobanNotice");
+    AUTHORIZED_LOGIN_NOTIFY(8001,"账号授权通知", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"authorized_login_notify","/pages/route/index?pageType=","hbapp_video_auth","authorizedLoginNotify","haobanNotice"),
+    AUTHORIZED_LOGOUT_NOTIFY(8002,"账号异常退出通知", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"authorized_logout_notify","/pages/route/index?pageType=","hbapp_video_auth","authorizedLogoutNotify","haobanNotice");
 
     /**
      * 消息类型

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

@@ -644,8 +644,10 @@ public class WelcomeServiceImpl implements WelcomeService {
             bo.setMiniprogramSettingId(one.getMiniProgramId());
             bo.setMediaId(one.getMediaId());
             bo.setMediaTime(one.getMediaTime());
-            if(StringUtils.isBlank(one.getMediaId())) {
-                bo.setMediaUrl(null);
+            if(one.getMediaType()==5) {
+                if (StringUtils.isBlank(one.getMediaId())) {
+                    bo.setMediaUrl(null);
+                }
             }
             return bo;
         }).collect(Collectors.toList());