From 0d341f1aaa210119a3bad591f84438e48a7f602d Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期六, 18 七月 2020 16:24:04 +0800 Subject: [PATCH] 代码生成查询条件修正 --- ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java | 2 +- ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java index 65b4a66..f63f598 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java @@ -197,7 +197,7 @@ { this.avatar = avatar; } - + @JsonIgnore @JsonProperty public String getPassword() diff --git a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml index 0c58d72..64a1f5e 100644 --- a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml +++ b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml @@ -63,10 +63,10 @@ AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) </if> <if test="beginTime != null and beginTime != ''"><!-- 寮�濮嬫椂闂存绱� --> - AND create_time >= to_date(#{beginTime},'yyyy-MM-dd HH24:mi:ss') + AND date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') </if> <if test="endTime != null and endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� --> - AND create_time <= to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss') + AND date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') </if> </where> </select> -- Gitblit v1.9.3