代码生成查询时忽略大小写&翻页记住选中&表注释未填写也允许导入

master
RuoYi 5 years ago committed by Limy
parent e954a5f7a3
commit 3f06178849

@ -1,6 +1,7 @@
package com.ruoyi.generator.util; package com.ruoyi.generator.util;
import java.util.Arrays; import java.util.Arrays;
import org.apache.commons.lang3.RegExUtils;
import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.generator.config.GenConfig; import com.ruoyi.generator.config.GenConfig;
@ -179,7 +180,7 @@ public class GenUtils
*/ */
public static String replaceText(String text) public static String replaceText(String text)
{ {
return text.replaceAll("(?:表|若依)", ""); return RegExUtils.replaceAll(text, "(?:表|若依)", "");
} }
/** /**

@ -57,10 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectGenTableVo"/> <include refid="selectGenTableVo"/>
<where> <where>
<if test="tableName != null and tableName != ''"> <if test="tableName != null and tableName != ''">
AND table_name like concat('%', #{tableName}, '%') AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
</if> </if>
<if test="tableComment != null and tableComment != ''"> <if test="tableComment != null and tableComment != ''">
AND table_comment like concat('%', #{tableComment}, '%') AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
</if> </if>
</where> </where>
</select> </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 LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
AND table_name NOT IN (select table_name from gen_table) AND table_name NOT IN (select table_name from gen_table)
<if test="tableName != null and tableName != ''"> <if test="tableName != null and tableName != ''">
AND table_name like concat('%', #{tableName}, '%') AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
</if> </if>
<if test="tableComment != null and tableComment != ''"> <if test="tableComment != null and tableComment != ''">
AND table_comment like concat('%', #{tableComment}, '%') AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
</if> </if>
</select> </select>

@ -68,7 +68,10 @@
sortOrder: "desc", sortOrder: "desc",
showExport: true, showExport: true,
modalName: "生成配置", modalName: "生成配置",
rememberSelected: true,
uniqueId: "tableName",
columns: [{ columns: [{
field: 'state',
checkbox: true checkbox: true
}, },
{ {

@ -44,7 +44,10 @@
showToggle: false, showToggle: false,
showColumns: false, showColumns: false,
clickToSelect: true, clickToSelect: true,
rememberSelected: true,
uniqueId: "tableName",
columns: [{ columns: [{
field: 'state',
checkbox: true checkbox: true
}, },
{ {

Loading…
Cancel
Save