songwei
/
fxfast-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码生成查询条件修正

This commit is contained in:
RuoYi 2020-07-18 16:24:04 +08:00
parent 11ab4b4832
commit 0d341f1aaa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
View File

@ -197,7 +197,7 @@ public class SysUser extends BaseEntity
{ {
this.avatar = avatar; this.avatar = avatar;
} }
@JsonIgnore @JsonIgnore
@JsonProperty @JsonProperty
public String getPassword() public String getPassword()

4
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
View File

@ -63,10 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
</if> </if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 --> <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
AND create_time &gt;= to_date(#{beginTime},'yyyy-MM-dd HH24:mi:ss') AND date_format(create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
</if> </if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 --> <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
AND create_time &lt;= to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss') AND date_format(create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
</where> </where>
</select> </select>