diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts
index 8d97a34ff..3e8fe7f99 100644
--- a/game-server/app/servers/role/handler/heroHandler.ts
+++ b/game-server/app/servers/role/handler/heroHandler.ts
@@ -5,7 +5,7 @@ import { resResult, getItems, decodeStr } from '../../../pubUtils/util';
 import { STATUS } from '../../../consts/statusCode';
 import {HeroModel} from '../../../db/Hero';
 import {CURRENCY_BY_TYPE, CURRENCY_TYPE, ITID, CONSUME_TYPE, HERO_GROW_MAX} from '../../../consts/consts'; 
-import {getJobInfoById, getMaxGradeByjobClass ,getHeroInfoById, getGoodById, getHeroExpByLv, getGamedata, getJobByGradeAndClass, getFriendShipById, getFriendShipLevels} from '../../../pubUtils/gamedata';
+import {getJobInfoById, getMaxGradeByjobClass, getHeroInfoById, getGoodById, getHeroExpByLv, getGamedata, getJobByGradeAndClass, getFriendShipById, getFriendShipLevels, getFashionsById} from '../../../pubUtils/gamedata';
 import { ABI_STAGE } from '../../../consts/abilityConst';
 import { RoleModel } from '../../../db/Role';
 
@@ -321,7 +321,7 @@ export class HeroHandler {
         if(!result) {
             return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
         }
-        hero.job = nextHeroJob.job;
+        hero.job = nextHeroJob.jobid;
         hero.jobStage = 0;
         //重算战力并下发
         let heros = await calPlayerCeAndSave(sid, roleId, [hero]);
@@ -407,11 +407,10 @@ export class HeroHandler {
         let roleId: string = session.get('roleId');
         let sid: string = session.get('sid');
         let { id } = msg;
-        let skinInfo;//TODO查询时装
+        let skinInfo = getFashionsById(id);
         if (!skinInfo) 
             resResult(STATUS.HERO_SKIN_NOT_FIND);
-        let hid;//TODO获得时装的武将id
-        let hero = await HeroModel.findByHidAndRole(hid, roleId);
+        let hero = await HeroModel.findByHidAndRole(skinInfo.actorId, roleId);
         if (!hero)
             resResult(STATUS.HERO_NOT_FIND);
         if (!!_.findWhere(hero.skins, {id:id}))
@@ -426,7 +425,7 @@ export class HeroHandler {
             enable:false
         });
         let heros = await HeroModel.findByRole(roleId);
-        for (let i = 0; i < heros.lenth; i++) {
+        for (let i = 0; i < heros.length; i++) {
             if (heros[i].hid == hero.hid) {
                 heros[i] = hero;
             }
@@ -441,11 +440,10 @@ export class HeroHandler {
         let roleId: string = session.get('roleId');
         let sid: string = session.get('sid');
         let { id } = msg;
-        let skinInfo;//TODO查询时装
+        let skinInfo = getFashionsById(id);
         if (!skinInfo) 
             resResult(STATUS.HERO_SKIN_NOT_FIND);
-        let hid;
-        let hero = await HeroModel.findByHidAndRole(hid, roleId);
+        let hero = await HeroModel.findByHidAndRole(skinInfo.actorId, roleId);
         if (!hero)
             resResult(STATUS.HERO_NOT_FIND);
         let result = false;