Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
4a430462
Commit
4a430462
authored
Jun 15, 2020
by
邓实川
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git
into dsc
parents
aaa8c206
6fdcfe4b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
1 deletions
+1
-1
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
+0
-0
src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml
+1
-1
No files found.
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
View file @
4a430462
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml
View file @
4a430462
...
@@ -306,7 +306,7 @@
...
@@ -306,7 +306,7 @@
LEFT JOIN jxgl_performance_appraisal c ON a.performance_appraisal_id = c.id
LEFT JOIN jxgl_performance_appraisal c ON a.performance_appraisal_id = c.id
<where>
<where>
a
.org_code = #{param.orgCode}
c
.org_code = #{param.orgCode}
<if
test=
"param.query != null and param.query != ''"
>
<if
test=
"param.query != null and param.query != ''"
>
and (
and (
b.name like CONCAT('%',#{param.query},'%') or
b.name like CONCAT('%',#{param.query},'%') or
...
...
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