From 6faadd1edad244474b02561d581c84dd9c67fd12 Mon Sep 17 00:00:00 2001
From: Tang <tangllty@163.com>
Date: Sat, 23 Dec 2023 15:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8C=85=E5=90=AB=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 databases/20221210.sql                                       | 2 +-
 .../main/java/com/tang/generator/entity/GenTableColumn.java  | 2 +-
 tang-generator/src/main/resources/vm/xml/mapper.xml.vm       | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/databases/20221210.sql b/databases/20221210.sql
index 8b7ad6bd..6d58d7c1 100644
--- a/databases/20221210.sql
+++ b/databases/20221210.sql
@@ -465,7 +465,7 @@ create table gen_table_column (
     is_insert       char(1)       default '0'              comment '是否为插入字段{0=否, 1=是}',
     is_edit         char(1)       default '0'              comment '是否编辑字段{0=否, 1=是}',
     is_required     char(1)       default '0'              comment '是否必填{0=否, 1=是}',
-    query_type      varchar(128)  default 'equal'          comment '查询方式{equal=等于, fuzzy=模糊}',
+    query_type      varchar(128)  default 'equal'          comment '查询方式{equal=等于, fuzzy=模糊, findInSet=包含}',
     html_type       varchar(128)  default ''               comment '显示类型',
     dict_type       varchar(128)  default ''               comment '字典类型',
     sort            int(4)        default 0                comment '显示顺序',
diff --git a/tang-generator/src/main/java/com/tang/generator/entity/GenTableColumn.java b/tang-generator/src/main/java/com/tang/generator/entity/GenTableColumn.java
index 25c88bab..00cf709c 100644
--- a/tang-generator/src/main/java/com/tang/generator/entity/GenTableColumn.java
+++ b/tang-generator/src/main/java/com/tang/generator/entity/GenTableColumn.java
@@ -83,7 +83,7 @@ public class GenTableColumn extends BaseEntity {
     private String isRequired;
 
     /**
-     * 查询方式{equal=等于, fuzzy=模糊}
+     * 查询方式{equal=等于, fuzzy=模糊, findInSet=包含}
      */
     private String queryType;
 
diff --git a/tang-generator/src/main/resources/vm/xml/mapper.xml.vm b/tang-generator/src/main/resources/vm/xml/mapper.xml.vm
index 6dc7d127..2609bad4 100644
--- a/tang-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/tang-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -27,6 +27,11 @@
                 and ${tableAlias}.$column.columnName like concat('%', #{$column.javaField}, '%')
             </if>
 #end
+#if($column.queryType == "in")
+            <if test="$column.javaField != null#if($column.javaType == 'String') and $column.javaField != ''#end">
+                and find_in_set(#{$column.javaField}, ${tableAlias}.$column.columnName)
+            </if>
+#end
 #end
         </where>
     </select>