From 512d4503d77269c7396481bc54c8fb3e4383c89d Mon Sep 17 00:00:00 2001
From: mazhicheng <new123456>
Date: Sun, 5 Jul 2020 12:15:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/diboot/core/binding/QueryBuilder.java   | 2 +-
 diboot-file-starter/pom.xml                               | 2 ++
 .../diboot/file/example/custom/DepartmentExcelModel.java  | 8 --------
 .../java/com/diboot/file/example/test/ExcelWriteTest.java | 8 ++++----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java b/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
index 2c74792..38b3d27 100644
--- a/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
+++ b/diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
@@ -161,7 +161,7 @@ public class QueryBuilder {
             // 对比类型
             Comparison comparison = Comparison.EQ;
             // 转换条件
-            String columnName = getColumnName(field);;
+            String columnName = getColumnName(field);
             if(query != null){
                 comparison = query.comparison();
                 AnnoJoiner annoJoiner = ParserCache.getAnnoJoiner(dto.getClass(), entry.getKey());
diff --git a/diboot-file-starter/pom.xml b/diboot-file-starter/pom.xml
index a95541e..07f5b44 100644
--- a/diboot-file-starter/pom.xml
+++ b/diboot-file-starter/pom.xml
@@ -51,12 +51,14 @@
             <groupId>net.coobird</groupId>
             <artifactId>thumbnailator</artifactId>
             <version>0.4.11</version>
+            <optional>true</optional>
         </dependency>
         <!-- 验证码示例 -->
         <dependency>
             <groupId>com.github.whvcse</groupId>
             <artifactId>easy-captcha</artifactId>
             <version>1.6.2</version>
+            <optional>true</optional>
         </dependency>
 
     </dependencies>
diff --git a/diboot-file-starter/src/test/java/com/diboot/file/example/custom/DepartmentExcelModel.java b/diboot-file-starter/src/test/java/com/diboot/file/example/custom/DepartmentExcelModel.java
index e31ce7e..d9e4990 100644
--- a/diboot-file-starter/src/test/java/com/diboot/file/example/custom/DepartmentExcelModel.java
+++ b/diboot-file-starter/src/test/java/com/diboot/file/example/custom/DepartmentExcelModel.java
@@ -61,12 +61,4 @@ public class DepartmentExcelModel extends BaseExcelModel {
     @ExcelBindDict(type = "USER_STATUS")
     @ExcelProperty(value = "状态", index = 4)
     private String userStatus;
-
-    @ExcelBindField(entity = UploadFile.class, field = "fileName", setIdField = "fileUid",
-            duplicate = DuplicateStrategy.WARN, empty = EmptyStrategy.SET_0)
-    @ExcelProperty(value = "文件", index = 5)
-    private String fileName;
-
-    private String fileUid;
-
 }
diff --git a/diboot-file-starter/src/test/java/com/diboot/file/example/test/ExcelWriteTest.java b/diboot-file-starter/src/test/java/com/diboot/file/example/test/ExcelWriteTest.java
index ca9ea72..01cdff2 100644
--- a/diboot-file-starter/src/test/java/com/diboot/file/example/test/ExcelWriteTest.java
+++ b/diboot-file-starter/src/test/java/com/diboot/file/example/test/ExcelWriteTest.java
@@ -40,11 +40,11 @@ public class ExcelWriteTest extends ApplicationTest {
      */
     public List<List<String>> buildNormalData(){
         List<List<String>> dataList = new ArrayList<>();
-        dataList.add(Arrays.asList("上级部门", "单位", "名称", "数量", "状态", "文件"));
+        dataList.add(Arrays.asList("上级部门", "单位", "名称", "数量", "状态"));
 
-        dataList.add(Arrays.asList("产品部", "dibo", "研发中心", "10", "在职", "department.xlsx"));
-        dataList.add(Arrays.asList("", "dibo", "营销中心", "10", "在职", ""));
-        dataList.add(Arrays.asList("产品部", "dibo", "财务部", "10", "离职", null));
+        dataList.add(Arrays.asList("产品部", "dibo", "研发中心", "10", "在职"));
+        dataList.add(Arrays.asList("", "dibo", "营销中心", "10", "在职"));
+        dataList.add(Arrays.asList("产品部", "dibo", "财务部", "10", "离职"));
         return dataList;
     }