diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
index ff771ef..91d67a4 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
@@ -287,14 +287,14 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                 List<YxHistoryMajorEnroll> updateList = new ArrayList<>();
                 List<YxHistoryMajorEnroll> list = ExcelImportUtil.importExcel(file.getInputStream(), YxHistoryMajorEnroll.class, params);
                 for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) {
-                    index++;
                     schoolCode = yxHistoryMajorEnroll.getSchoolCode();//学校代码
                     schoolName = yxHistoryMajorEnroll.getSchoolName();//学校名称
-                    if(schoolCode.equals("6170")){
-                        System.out.println("aaaa");
-                    }
                     majorName = yxHistoryMajorEnroll.getMajorName();//专业名称
                     batch = yxHistoryMajorEnroll.getBatch();//批次
+                    if (StringUtils.isBlank(schoolCode) && StringUtils.isBlank(schoolName) && StringUtils.isBlank(majorName)) {
+                        continue;
+                    }
+                    index++;
                     year = yxHistoryMajorEnroll.getYear();
                     enrollmentCode = yxHistoryMajorEnroll.getEnrollmentCode();//招生代码
                     majorType = yxHistoryMajorEnroll.getMajorType();//专业类型
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java
index b7f6970..cd7d230 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java
@@ -72,10 +72,14 @@ public class YxCalculationMajor implements Serializable {
     @Excel(name = "录取方式缩写", width = 15)
     @ApiModelProperty(value = "录取方式缩写")
     private String rulesEnrollProbabilitySx;
-	/**录取方式*/
-	@Excel(name = "录取方式", width = 15)
-    @ApiModelProperty(value = "录取方式")
+	/**对外录取方式*/
+	@Excel(name = "对外录取方式", width = 15)
+    @ApiModelProperty(value = "对外录取方式")
     private java.lang.String rulesEnrollProbability;
+    /**对外录取方式运算符*/
+    @Excel(name = "对外录取方式运算符", width = 15)
+    @ApiModelProperty(value = "对外录取方式运算符")
+    private java.lang.String probabilityOperator;
 	/**批次*/
 	@Excel(name = "批次", width = 15)
     @ApiModelProperty(value = "批次")
@@ -92,10 +96,7 @@ public class YxCalculationMajor implements Serializable {
 	@Excel(name = "录取率", width = 15)
     @ApiModelProperty(value = "录取率")
     private java.math.BigDecimal enrollProbability;
-	/**录取概率计算规则运算符*/
-	@Excel(name = "录取概率计算规则运算符", width = 15)
-    @ApiModelProperty(value = "录取概率计算规则运算符")
-    private java.lang.String probabilityOperator;
+
 	/**创建日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")