Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
platform
/
finance_serv
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit a8c597ac
authored
Sep 12, 2018
by
谢明辉
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
Merge branch 'develop' of
http://192.168.9.26/platform/finance_serv
into develop
2 parents
8758f938
5d574bce
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
View file @
a8c597a
...
...
@@ -321,7 +321,7 @@
#{salesperson_unid}
</foreach>
</if>
<if
test=
"contract_states !=null"
>
<if
test=
"contract_states !=null
and contract_states.length > 0
"
>
and
contract_state in
<foreach
collection=
"contract_states"
index=
"index"
item=
"contract_state"
open=
"("
close=
")"
separator=
","
>
...
...
@@ -458,14 +458,14 @@
and
contract_unid=#{contract_unid}
</if>
<if
test=
"salesperson_unids !=null"
>
<if
test=
"salesperson_unids !=null
and salesperson_unids.length > 0
"
>
and
salesperson_unid in
<foreach
collection=
"salesperson_unids"
index=
"index"
item=
"salesperson_unid"
open=
"("
close=
")"
separator=
","
>
#{salesperson_unid}
</foreach>
</if>
<if
test=
"contract_states !=null"
>
<if
test=
"contract_states !=null
and contract_states.length > 0
"
>
and
contract_state in
<foreach
collection=
"contract_states"
index=
"index"
item=
"contract_state"
open=
"("
close=
")"
separator=
","
>
...
...
@@ -636,7 +636,7 @@
#{salesperson_unid}
</foreach>
</if>
<if
test=
"contract_states !=null"
>
<if
test=
"contract_states !=null
and contract_states.length > 0
"
>
and
contract_state in
<foreach
collection=
"contract_states"
index=
"index"
item=
"contract_state"
open=
"("
close=
")"
separator=
","
>
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment