Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
0d341f1a
Commit
0d341f1a
authored
Jul 18, 2020
by
RuoYi
Browse files
代码生成查询条件修正
parent
11ab4b48
Changes
2
Hide whitespace changes
Inline
Side-by-side
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
View file @
0d341f1a
...
@@ -197,7 +197,7 @@ public class SysUser extends BaseEntity
...
@@ -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
()
...
...
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
View file @
0d341f1a
...
@@ -63,10 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -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
>
= to_d
at
e
(#{beginTime},'
yyyy-MM-dd HH24:mi:ss
')
AND
date_format(create_time,'%y%m%d')
>
= date_form
at(#{beginTime},'
%y%m%d
')
</if>
</if>
<if
test=
"endTime != null and endTime != ''"
>
<!-- 结束时间检索 -->
<if
test=
"endTime != null and endTime != ''"
>
<!-- 结束时间检索 -->
AND
create_time
<
= to_d
at
e
(#{endTime},'
yyyy-MM-dd HH24:mi:ss
')
AND
date_format(create_time,'%y%m%d')
<
= date_form
at(#{endTime},'
%y%m%d
')
</if>
</if>
</where>
</where>
</select>
</select>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment