From 11ab4b4832f8d9222646d083c92204d7b2b7f5fc Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 18 七月 2020 12:32:22 +0800
Subject: [PATCH] 缺少JsonIgnore包路径。
---
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
index 25e64f8..0c58d72 100644
--- a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
@@ -62,12 +62,12 @@
<if test="tableComment != null and tableComment != ''">
AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
</if>
-<!-- <if test="beginTime != null and beginTime != ''">开始时间检索 -->
-<!-- AND date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') -->
-<!-- </if> -->
-<!-- <if test="endTime != null and endTime != ''">结束时间检索 -->
-<!-- AND date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') -->
-<!-- </if> -->
+ <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+ AND create_time >= to_date(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+ </if>
+ <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+ AND create_time <= to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+ </if>
</where>
</select>
@@ -110,7 +110,7 @@
c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t
LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- where t.table_id = #{tableId}
+ where t.table_id = #{tableId} order by c.sort
</select>
<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
@@ -118,7 +118,7 @@
c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t
LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- where t.table_name = #{tableName}
+ where t.table_name = #{tableName} order by c.sort
</select>
<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
--
Gitblit v1.9.2