From fe0071665ee1393200be1a8f846e48d13facefb9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 24 Sep 2021 15:30:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=86=E5=88=ABes=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               | 51 +++++++++----------
 .../dataease/provider/es/EsQueryProvider.java |  2 +
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 3f1c27dc83..56c47df966 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -94,11 +94,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
@@ -141,16 +136,6 @@
             <artifactId>java-jwt</artifactId>
             <version>${jwt.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>7.4.1.jre8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.2.14</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
@@ -209,6 +194,20 @@
             <artifactId>ehcache</artifactId>
             <version>2.9.1</version>
         </dependency>
+
+        <!--由于暂时插件接口未注册到公司仓库，请先down下代码安装到本地仓库
+        https://github.com/dataease/dataease-plugins-->
+        <dependency>
+            <groupId>io.dataease</groupId>
+            <artifactId>dataease-plugin-interface</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.4</version>
+        </dependency>
+        <!-- kettle及数据源依赖 -->
         <dependency>
             <groupId>pentaho-kettle</groupId>
             <artifactId>kettle-core</artifactId>
@@ -234,28 +233,26 @@
             <artifactId>c3p0</artifactId>
             <version>0.9.1.2</version>
         </dependency>
-        <!--由于暂时插件接口未注册到公司仓库，请先down下代码安装到本地仓库
-        https://github.com/dataease/dataease-plugins-->
-        <dependency>
-            <groupId>io.dataease</groupId>
-            <artifactId>dataease-plugin-interface</artifactId>
-            <version>1.3</version>
-        </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc8</artifactId>
             <version>12.2.0.1</version>
         </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.7.4</version>
-        </dependency>
         <dependency>
             <groupId>ru.yandex.clickhouse</groupId>
             <artifactId>clickhouse-jdbc</artifactId>
             <version>0.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>7.4.1.jre8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.14</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java
index 9f8924c6eb..0c287565f5 100644
--- a/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java
@@ -35,6 +35,7 @@ public class EsQueryProvider extends QueryProvider {
 
     @Override
     public Integer transFieldType(String field) {
+        field = field.toLowerCase();
         switch (field) {
             case "keyword":
             case "text":
@@ -64,6 +65,7 @@ public class EsQueryProvider extends QueryProvider {
     }
 
     public static Integer transFieldTypeSize(String field) {
+        field = field.toLowerCase();
         switch (field) {
             case "null":
                 return 1;