From f6f1ae626dbd5d62bff46c4a67a0124cdd4a8875 Mon Sep 17 00:00:00 2001
From: maLix <mlx950324@163.com>
Date: Sat, 1 Jul 2023 16:44:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=EF=BC=8C=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E5=80=99=EF=BC=8C=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=92=8C=E9=82=AE=E7=AE=B1=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/listener/MyValidateExcelCellDataListener.java    | 2 ++
 .../ibeetl/jlw/entity/dto/StudentBatchImportAdminDTO.java  | 2 ++
 .../jlw/entity/dto/StudentBatchImportUniAdminDTO.java      | 2 ++
 .../com/ibeetl/jlw/entity/dto/TeacherBatchImportDTO.java   | 7 +++++++
 4 files changed, 13 insertions(+)

diff --git a/web/src/main/java/cn/jlw/util/excel/listener/MyValidateExcelCellDataListener.java b/web/src/main/java/cn/jlw/util/excel/listener/MyValidateExcelCellDataListener.java
index 55565d72..77c61381 100644
--- a/web/src/main/java/cn/jlw/util/excel/listener/MyValidateExcelCellDataListener.java
+++ b/web/src/main/java/cn/jlw/util/excel/listener/MyValidateExcelCellDataListener.java
@@ -89,6 +89,8 @@ public class MyValidateExcelCellDataListener<T> implements ReadListener<T> {
                 // 如果有忽略必传的注解，并且没有查询到值则直接跳过必传验证
                 if (requireIgnore != null && fieldValue == null) {
                     ReflectUtil.setFieldValue(bean, field, requireIgnore.defaultValue());
+                    // 如果字段上有忽略的注解，则下面的验证就直接跳过了。
+                    continue;
                 }
 
                 // 空值判断
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportAdminDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportAdminDTO.java
index 0ea90435..6b057f4a 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportAdminDTO.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportAdminDTO.java
@@ -65,12 +65,14 @@ public class StudentBatchImportAdminDTO {
      * 电话
      */
     @Mobile
+    @ExcelRequireIgnore
     private String studentMobile ;
 
     /**
      * 邮箱
      */
     @Email
+    @ExcelRequireIgnore
     private String studentEmail ;
     /**
      * 微信
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportUniAdminDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportUniAdminDTO.java
index 6bb8ac32..087aff9f 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportUniAdminDTO.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportUniAdminDTO.java
@@ -59,12 +59,14 @@ public class StudentBatchImportUniAdminDTO {
      * 电话
      */
     @Mobile
+    @ExcelRequireIgnore
     private String studentMobile ;
 
     /**
      * 邮箱
      */
     @Email
+    @ExcelRequireIgnore
     private String studentEmail ;
     /**
      * 微信
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherBatchImportDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherBatchImportDTO.java
index ac1f8be9..00d0d7c0 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherBatchImportDTO.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherBatchImportDTO.java
@@ -1,7 +1,10 @@
 package com.ibeetl.jlw.entity.dto;
 
+import com.ibeetl.admin.core.annotation.ExcelRequireIgnore;
 import com.ibeetl.admin.core.util.excelGroupValidation.ExcelFile;
 import com.ibeetl.admin.core.util.excelGroupValidation.ExcelValidation;
+import com.ibeetl.admin.core.validation.Email;
+import com.ibeetl.admin.core.validation.Mobile;
 import com.ibeetl.jlw.entity.Teacher;
 import com.ibeetl.jlw.enums.GenderEnum;
 import lombok.Data;
@@ -57,11 +60,15 @@ public class TeacherBatchImportDTO {
     /**
      * 电话
      */
+    @Mobile
+    @ExcelRequireIgnore
     private String teacherMobile ;
 
     /**
      * 邮箱
      */
+    @Email
+    @ExcelRequireIgnore
     private String teacherEmail ;
 
     /**