Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
0d341f1a
Commit
0d341f1a
authored
Jul 18, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码生成查询条件修正
parent
11ab4b48
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
SysUser.java
...rc/main/java/com/ruoyi/project/system/domain/SysUser.java
+1
-1
GenTableMapper.xml
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
+2
-2
No files found.
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_date(#{beginTime},'yyyy-MM-dd HH24:mi:ss
')
AND
date_format(create_time,'%y%m%d')
>
= date_format(#{beginTime},'%y%m%d
')
</if>
</if>
<if
test=
"endTime != null and endTime != ''"
>
<!-- 结束时间检索 -->
<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>
</if>
</where>
</where>
</select>
</select>
...
...
Write
Preview
Markdown
is supported
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