RuoYi
2020-07-18 0d341f1aaa210119a3bad591f84438e48a7f602d
代码生成查询条件修正
2 files modified
6 ■■■■ changed files
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java 2 ●●● patch | view | raw | blame | history
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml 4 ●●●● patch | view | raw | blame | history
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -197,7 +197,7 @@
    {
        this.avatar = avatar;
    }
    @JsonIgnore
    @JsonProperty
    public String getPassword()
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 &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 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>
        </where>
    </select>