Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
9569e9a6
Commit
9569e9a6
authored
Sep 14, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
4e862694
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
VehicleMapper.xml
...ehicle-server/src/main/resources/mapper/VehicleMapper.xml
+2
-2
VehicleWarningMsgMapper.xml
...ver/src/main/resources/mapper/VehicleWarningMsgMapper.xml
+1
-1
No files found.
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @
9569e9a6
...
@@ -754,7 +754,7 @@
...
@@ -754,7 +754,7 @@
</foreach>
</foreach>
</if>
</if>
<if
test=
"parkBranchCompanyId != null and parkBranchCompanyId > 0"
>
<if
test=
"parkBranchCompanyId != null and parkBranchCompanyId > 0"
>
and (bc2.id = #{parkBranchCompanyId} or bc3.id = #{parkBranchCompanyId}
or
bc4.id = #{parkBranchCompanyId})
and (bc2.id = #{parkBranchCompanyId} or bc3.id = #{parkBranchCompanyId}
or
bc4.id = #{parkBranchCompanyId})
</if>
</if>
<if
test=
"branchId != null and branchId > 0"
>
<if
test=
"branchId != null and branchId > 0"
>
and (bc2.company_id = #{branchId} or bc3.company_id = #{branchId} or bc4.company_id = #{branchId})
and (bc2.company_id = #{branchId} or bc3.company_id = #{branchId} or bc4.company_id = #{branchId})
...
@@ -909,7 +909,7 @@
...
@@ -909,7 +909,7 @@
</foreach>
</foreach>
</if>
</if>
<if
test=
"parkBranchCompanyId != null and parkBranchCompanyId > 0"
>
<if
test=
"parkBranchCompanyId != null and parkBranchCompanyId > 0"
>
and (bc1.id = #{parkBranchCompanyId} or bc3.id = #{parkBranchCompanyId}or bc4.id = #{parkBranchCompanyId})
and (bc1.id = #{parkBranchCompanyId} or bc3.id = #{parkBranchCompanyId}
or bc4.id = #{parkBranchCompanyId})
</if>
</if>
<if
test=
"branchId != null and branchId > 0"
>
<if
test=
"branchId != null and branchId > 0"
>
and (bc1.company_id = #{branchId} or bc3.company_id = #{branchId} or bc4.company_id = #{branchId})
and (bc1.company_id = #{branchId} or bc3.company_id = #{branchId} or bc4.company_id = #{branchId})
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleWarningMsgMapper.xml
View file @
9569e9a6
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
</foreach>
</foreach>
</if>
</if>
<if
test=
"parkBranchCompanyId != null and parkBranchCompanyId > 0"
>
<if
test=
"parkBranchCompanyId != null and parkBranchCompanyId > 0"
>
and (bc2.id = #{parkBranchCompanyId} or bc3.id = #{parkBranchCompanyId}or bc4.id = #{parkBranchCompanyId})
and (bc2.id = #{parkBranchCompanyId} or bc3.id = #{parkBranchCompanyId}
or bc4.id = #{parkBranchCompanyId})
</if>
</if>
<if
test=
"branchId != null and branchId > 0"
>
<if
test=
"branchId != null and branchId > 0"
>
and (bc2.company_id = #{branchId} or bc3.company_id = #{branchId} or bc4.company_id = #{branchId})
and (bc2.company_id = #{branchId} or bc3.company_id = #{branchId} or bc4.company_id = #{branchId})
...
...
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