diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua
index 6501cf6c..c0664058 100644
--- a/lua/app/module/battle/controller/battle_controller.lua
+++ b/lua/app/module/battle/controller/battle_controller.lua
@@ -1959,8 +1959,8 @@ function BattleController:getShuffleBoardInfo()
                 else
                     if entity:getSkillId() then
                         haveSkill = true
-                        add = entity:canLink()
                     end
+                    add = entity:canLink()
                 end
                 if add then
                     table.insert(tempList, entity)
diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua
index 92608019..9ca5cf43 100644
--- a/lua/app/userdata/hero/hero_entity.lua
+++ b/lua/app/userdata/hero/hero_entity.lua
@@ -262,7 +262,7 @@ function HeroEntity:getActiveTogueSkills()
 		if id then
 			table.insert(list, id)
 		else
-			return
+			break
 		end
 	end