From 3f06178849eb1151286aee9df0c8d971fd1d6899 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 12 Nov 2019 15:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=B6=E5=BF=BD=E7=95=A5=E5=A4=A7=E5=B0=8F=E5=86=99?=
 =?UTF-8?q?&=E7=BF=BB=E9=A1=B5=E8=AE=B0=E4=BD=8F=E9=80=89=E4=B8=AD&?=
 =?UTF-8?q?=E8=A1=A8=E6=B3=A8=E9=87=8A=E6=9C=AA=E5=A1=AB=E5=86=99=E4=B9=9F?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/generator/util/GenUtils.java  | 3 ++-
 .../main/resources/mapper/generator/GenTableMapper.xml    | 8 ++++----
 .../src/main/resources/templates/tool/gen/gen.html        | 3 +++
 .../main/resources/templates/tool/gen/importTable.html    | 3 +++
 .../src/main/resources/mapper/system/SysUserMapper.xml    | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index 24f3924d..4f04e8fb 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -1,6 +1,7 @@
 package com.ruoyi.generator.util;
 
 import java.util.Arrays;
+import org.apache.commons.lang3.RegExUtils;
 import com.ruoyi.common.constant.GenConstants;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.generator.config.GenConfig;
@@ -179,7 +180,7 @@ public class GenUtils
      */
     public static String replaceText(String text)
     {
-        return text.replaceAll("(?:表|若依)", "");
+        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
     }
 
     /**
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index cac87076..1682f621 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -57,10 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectGenTableVo"/>
 		<where>
 			<if test="tableName != null and tableName != ''">
-				AND table_name like concat('%', #{tableName}, '%')
+				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
 			</if>
 			<if test="tableComment != null and tableComment != ''">
-				AND table_comment like concat('%', #{tableComment}, '%')
+				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
 			</if>
 		</where>
 	</select>
@@ -71,10 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
 		AND table_name NOT IN (select table_name from gen_table)
 		<if test="tableName != null and tableName != ''">
-			AND table_name like concat('%', #{tableName}, '%')
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
 		</if>
 		<if test="tableComment != null and tableComment != ''">
-			AND table_comment like concat('%', #{tableComment}, '%')
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
 		</if>
 	</select>
 	
diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
index 551ddee4..b1396a93 100644
--- a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
+++ b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
@@ -68,7 +68,10 @@
 		        sortOrder: "desc",
 		        showExport: true,
 		        modalName: "生成配置",
+		        rememberSelected: true,
+		        uniqueId: "tableName",
 		        columns: [{
+		        	field: 'state',
 		            checkbox: true
 		        },
 		        {
diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
index 294ca856..0eb3509f 100644
--- a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
+++ b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
@@ -44,7 +44,10 @@
 		        showToggle: false,
 		        showColumns: false,
 		        clickToSelect: true,
+		        rememberSelected: true,
+		        uniqueId: "tableName",
 		        columns: [{
+		        	field: 'state',
 		            checkbox: true
 		        },
 		        {
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index b6b14a48..d32e2f6b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="roleName"     column="role_name"      />
 		<result property="roleKey"      column="role_key"       />
 		<result property="roleSort"     column="role_sort"      />
-		<result property="dataScope"     column="data_scope"    />
+		<result property="dataScope"    column="data_scope"     />
 		<result property="status"       column="role_status"    />
 	</resultMap>