diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
index 3bab10f0..5f578c2e 100644
--- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
+++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
@@ -47,8 +47,8 @@ public class VelocityUtil {
         boolean isSearch = false;
         List<String> fields = new LinkedList<>();
         for (GenTableColumn column : columns) {
-            fields.add(column.getColumnName());
             if (column.getIsQuery() == 1) {
+                fields.add(column.getColumnName());
                 isSearch = true;
             }
         }
@@ -68,6 +68,7 @@ public class VelocityUtil {
         velocityContext.put("fields", fields);
         velocityContext.put("isSearch", isSearch);
         velocityContext.put("isEqually", VelocityUtil.getIsEqually(columns));
+        System.out.println(fields);
 
         return velocityContext;
     }
diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
index c37ea3ca..25a2f3d6 100644
--- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm
+++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
@@ -85,7 +85,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
               #if($column.javaField.equals($column.columnName))
               "${column.queryType}:${column.javaField}:str",
               #else
-              "${column.queryType}:${column.javaField}@${column.columnName}:str",
+              "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str",
               #end
             #end
           #end
@@ -183,7 +183,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
               #if($column.javaField.equals($column.columnName))
               "${column.queryType}:${column.javaField}:str",
               #else
-              "${column.queryType}:${column.javaField}@${column.columnName}:str",
+              "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str",
               #end
               #end
                #end
@@ -250,7 +250,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         Integer limit = pageParam.getPageSize();
 
         MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>();
-        mpjQueryWrapper.leftJoin("${table.sub_table_name} f ON f.${table.sub_table_fk}=t.id")
+        mpjQueryWrapper.leftJoin("{$table.sub_table_name} f ON f.{$table.sub_table_fk}=t.id");
     #if($isSearch)
     #if($fields.contains("is_delete"))
         mpjQueryWrapper.eq("is_delete", 0);
@@ -285,7 +285,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
                 #if($column.javaField.equals($column.columnName))
                 "${column.queryType}:${column.javaField}:str",
                 #else
-                "${column.queryType}:${column.javaField}@${column.columnName}:str",
+                "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str",
                 #end
               #end
             #end
diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm
index d67fa710..9070f898 100644
--- a/server/like-generator/src/main/resources/java/validate.java.vm
+++ b/server/like-generator/src/main/resources/java/validate.java.vm
@@ -29,14 +29,14 @@ public class ${EntityName}Param implements Serializable {
     #if($column.isPk)
     @IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class})
     #end
-    #if(!$column.isPk && $column.isRequired)
+    #if(!$column.isPk && $column.isRequired  && !$column.columnType.equals('text'))
     @NotNull(message = "${column.javaField}参数缺失", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})
     #end
-    #if(!$column.isPk && $column.javaType.equals("String"))
+    #if(!$column.isPk && $column.javaType.equals("String") && !$column.columnType.equals('text'))
     @Length(max = ${column.columnLength}, message = "${column.javaField}参数不能超出${column.columnLength}个字符", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})
     #end
     #if(!$column.isPk && $column.javaField.substring(0,2)!="is" && ($column.javaType.equals("Integer") || $column.javaType.equals("Long")))
-    @DecimalMin(value = 0, message = "${column.javaField}参数值不能少于0", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})
+    @DecimalMin(value = "0", message = "${column.javaField}参数值不能少于0", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})
     #end
     #if(!$column.isPk && $column.javaField.substring(0,2)=="is" && $column.javaType.equals("Integer"))
     @IntegerContains(values = {0, 1}, message = "${column.javaField}参数值不在符合范围", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})