diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts
index a3f19f617..50c2ee987 100644
--- a/game-server/app/servers/role/handler/heroHandler.ts
+++ b/game-server/app/servers/role/handler/heroHandler.ts
@@ -141,9 +141,7 @@ export class HeroHandler {
         });
         let hero = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.INIT, sid, roleId, curHero, {});
         await calAllHeroCe(HERO_SYSTEM_TYPE.ADD_SKIN, sid, roleId, {}, [initialSkin])
-        if (dicHero.quality === HERO_INITIAL_QUALITY.ORANGE) {
-            pushComposeOrangeHero(roleId, roleName, serverId, hero);
-        }
+        pushComposeOrangeHero(roleId, roleName, serverId, hero);
         return resResult(STATUS.SUCCESS, {curHero: returnHeroCeRatio(hero)});
     }
 
@@ -259,9 +257,7 @@ export class HeroHandler {
             colorStar: hero.colorStar, 
             colorStarStage: hero.colorStarStage
         }
-        if (hero.star === HERO_GROW_MAX.STAR) {
-            pushHeroStarMax(roleId, roleName, serverId, hero);
-        }
+        pushHeroStarMax(roleId, roleName, serverId, hero);
         return resResult(STATUS.SUCCESS, {isUpStar, curHero});
     }
 
diff --git a/game-server/app/services/sysChatService.ts b/game-server/app/services/sysChatService.ts
index 760116c0e..75f936a85 100644
--- a/game-server/app/services/sysChatService.ts
+++ b/game-server/app/services/sysChatService.ts
@@ -1,7 +1,7 @@
 
 import { EPlace, HeroType } from '../db/Hero';
 import { GuildType } from '../db/Guild';
-import { CHANNEL_PREFIX, MSG_SOURCE, MSG_TYPE, ON_GROUP_MSG_ROUTE, STATUS, WAR_TYPE } from '../consts';
+import { CHANNEL_PREFIX, HERO_GROW_MAX, HERO_INITIAL_QUALITY, MSG_SOURCE, MSG_TYPE, ON_GROUP_MSG_ROUTE, STATUS, WAR_TYPE } from '../consts';
 import { createGroupMsg, pushGroupMsgToRoom } from './chatService';
 import { pick } from 'lodash';
 import { isArray, isString } from 'underscore';
@@ -21,10 +21,16 @@ export async function pushHeroQualityUpMsg(roleId: string, roleName: string, ser
 }
 
 export async function pushComposeOrangeHero(roleId: string, roleName: string, serverId: number | string, heroInfo: Partial<HeroType>) {
+    if (heroInfo.quality < HERO_INITIAL_QUALITY.ORANGE) {
+        return;
+    }
     await pushNormalHeroInfoBySource(roleId, roleName, serverId, MSG_SOURCE.COMPOSE_ORANGE_HERO, heroInfo);
 }
 
 export async function pushHeroStarMax(roleId: string, roleName: string, serverId: number | string, heroInfo: Partial<HeroType>) {
+    if (heroInfo.star !== HERO_GROW_MAX.STAR) {
+        return;
+    }
     await pushNormalHeroInfoBySource(roleId, roleName, serverId, MSG_SOURCE.HERO_STAR_MAX, heroInfo);
 }