Commit 0d341f1aaa210119a3bad591f84438e48a7f602d
1 parent
11ab4b48
代码生成查询条件修正
Showing
2 changed files
with
3 additions
and
3 deletions
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
| @@ -197,7 +197,7 @@ public class SysUser extends BaseEntity | @@ -197,7 +197,7 @@ public class SysUser extends BaseEntity | ||
| 197 | { | 197 | { |
| 198 | this.avatar = avatar; | 198 | this.avatar = avatar; |
| 199 | } | 199 | } |
| 200 | - | 200 | + |
| 201 | @JsonIgnore | 201 | @JsonIgnore |
| 202 | @JsonProperty | 202 | @JsonProperty |
| 203 | public String getPassword() | 203 | public String getPassword() |
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
| @@ -63,10 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -63,10 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 63 | AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) | 63 | AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) |
| 64 | </if> | 64 | </if> |
| 65 | <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 --> | 65 | <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 --> |
| 66 | - AND create_time >= to_date(#{beginTime},'yyyy-MM-dd HH24:mi:ss') | 66 | + AND date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') |
| 67 | </if> | 67 | </if> |
| 68 | <if test="endTime != null and endTime != ''"><!-- 结束时间检索 --> | 68 | <if test="endTime != null and endTime != ''"><!-- 结束时间检索 --> |
| 69 | - AND create_time <= to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss') | 69 | + AND date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') |
| 70 | </if> | 70 | </if> |
| 71 | </where> | 71 | </where> |
| 72 | </select> | 72 | </select> |