diff --git a/modules/equipment/module.go b/modules/equipment/module.go
index 0a90069b2..0c72841b9 100644
--- a/modules/equipment/module.go
+++ b/modules/equipment/module.go
@@ -772,16 +772,8 @@ func (this *Equipment) GMGetSuitAllEquip(session comm.IUserSession, suit int32,
 	conf, err = this.configure.GetSuitEquipmentConfigure(suit)
 	for _, v := range conf {
 		if v.Color == star {
-			if equipment, err = this.modelEquipment.newEquipment(session.GetUserId(), v, nil, false); err != nil {
-				errdata = &pb.ErrorData{
-					Code:    pb.ErrorCode_ConfigNoFound,
-					Title:   pb.ErrorCode_ConfigNoFound.ToString(),
-					Message: err.Error(),
-				}
-				return
-			}
-			for i := int32(0); i < lv; i++ {
-				if intensify, err = this.configure.GetEquipmentIntensifyConfigureById(v.EquipId, v.Color, equipment.Lv); err != nil {
+			for i := int32(0); i < num; i++ {
+				if equipment, err = this.modelEquipment.newEquipment(session.GetUserId(), v, nil, false); err != nil {
 					errdata = &pb.ErrorData{
 						Code:    pb.ErrorCode_ConfigNoFound,
 						Title:   pb.ErrorCode_ConfigNoFound.ToString(),
@@ -789,8 +781,8 @@ func (this *Equipment) GMGetSuitAllEquip(session comm.IUserSession, suit int32,
 					}
 					return
 				}
-				if len(intensify.Need) > 0 {
-					if err = this.modelEquipment.upgradeEquipment(equipment, v, intensify); err != nil {
+				for i := int32(0); i < lv; i++ {
+					if intensify, err = this.configure.GetEquipmentIntensifyConfigureById(v.EquipId, v.Color, equipment.Lv); err != nil {
 						errdata = &pb.ErrorData{
 							Code:    pb.ErrorCode_ConfigNoFound,
 							Title:   pb.ErrorCode_ConfigNoFound.ToString(),
@@ -798,6 +790,16 @@ func (this *Equipment) GMGetSuitAllEquip(session comm.IUserSession, suit int32,
 						}
 						return
 					}
+					if len(intensify.Need) > 0 {
+						if err = this.modelEquipment.upgradeEquipment(equipment, v, intensify); err != nil {
+							errdata = &pb.ErrorData{
+								Code:    pb.ErrorCode_ConfigNoFound,
+								Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+								Message: err.Error(),
+							}
+							return
+						}
+					}
 				}
 			}
 			equips = append(equips, equipment)