From b2b2926a26bfda8e86cc277fbd121816d1f104b1 Mon Sep 17 00:00:00 2001
From: gcii <3440626@qq.com>
Date: Mon, 12 Aug 2019 09:24:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/constant/GenConstants.java  | 2 +-
 .../src/main/java/com/ruoyi/generator/util/VelocityUtils.java  | 3 ++-
 sql/ry_20190808.sql                                            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
index e3c8bae..30ea77e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -76,7 +76,7 @@ public class GenConstants
     public static final String TYPE_DATE = "Date";
 
     /** 模糊查询 */
-    public static final String QUERY_LIKE = "Like";
+    public static final String QUERY_LIKE = "LIKE";
 
     /** 需要 */
     public static final String REQUIRE = "1";
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 9bfd0b7..a199613 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -34,11 +34,12 @@ public class VelocityUtils
         String businessName = genTable.getBusinessName();
         String packageName = genTable.getPackageName();
         String tplCategory = genTable.getTplCategory();
+        String functionName = genTable.getFunctionName();
 
         VelocityContext velocityContext = new VelocityContext();
         velocityContext.put("tplCategory", genTable.getTplCategory());
         velocityContext.put("tableName", genTable.getTableName());
-        velocityContext.put("functionName", genTable.getFunctionName());
+        velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
         velocityContext.put("ClassName", genTable.getClassName());
         velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
         velocityContext.put("moduleName", genTable.getModuleName());
diff --git a/sql/ry_20190808.sql b/sql/ry_20190808.sql
index 43f90e2..fc89acf 100644
--- a/sql/ry_20190808.sql
+++ b/sql/ry_20190808.sql
@@ -2685,7 +2685,7 @@ CREATE TABLE [dbo].[gen_table_column] (
   [is_edit] 					nchar(1)  									DEFAULT NULL 						NULL,
   [is_list] 					nchar(1)  									DEFAULT NULL 						NULL,
   [is_query] 					nchar(1)  									DEFAULT NULL 						NULL,
-  [query_type] 				nvarchar(200) 							DEFAULT ('=') 					NULL,
+  [query_type] 				nvarchar(200) 							DEFAULT ('EQ') 					NULL,
   [html_type] 				nvarchar(200)  							DEFAULT NULL 						NULL,
   [dict_type] 				nvarchar(200)  							DEFAULT '' 							NULL,
   [sort] 							int 												DEFAULT NULL 						NULL,