Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
reyun
manager
Commits
82665baf
Commit
82665baf
authored
Oct 21, 2019
by
kangxiaoshan
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限
parent
d9110314
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
.gitignore
.gitignore
+5
-2
workspace.xml
.idea/workspace.xml
+0
-0
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+6
-6
No files found.
.gitignore
View file @
82665baf
...
...
@@ -29,4 +29,8 @@ coverage-report
manager.iml
manage.iml
target
\ No newline at end of file
target
.idea/*
*.iml
.idea/workspace.xml
manage.iml
.idea/workspace.xml
View file @
82665baf
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
82665baf
...
...
@@ -1805,14 +1805,14 @@ public class ContractServiceImpl implements ContractService {
if
(
RoleEnum
.
FINANCE
.
getKey
().
equals
(
loginAccount
.
getRole
()))
{
filterContractMoney
(
codesList
,
authdata
,
list
,
1
);
list
=
filterContractMoney
(
codesList
,
authdata
,
list
,
1
);
}
else
if
(
RoleEnum
.
SALSEMAN
.
getKey
().
equals
(
loginAccount
.
getRole
()))
{
filterContractMoney
(
codesList
,
authdata
,
list
,
2
);
list
=
filterContractMoney
(
codesList
,
authdata
,
list
,
2
);
}
else
if
(
RoleEnum
.
PM
.
getKey
().
equals
(
loginAccount
.
getRole
()))
{
filterContractMoney
(
codesList
,
authdata
,
list
,
3
);
list
=
filterContractMoney
(
codesList
,
authdata
,
list
,
3
);
}
}
...
...
@@ -1844,17 +1844,17 @@ public class ContractServiceImpl implements ContractService {
return
list
;
}
private
void
filterContractMoney
(
List
<
String
>
codesList
,
Map
<
String
,
Object
>
authdata
,
List
<
ContractMoney
>
list
,
int
nextIndex
)
{
private
List
<
ContractMoney
>
filterContractMoney
(
List
<
String
>
codesList
,
Map
<
String
,
Object
>
authdata
,
List
<
ContractMoney
>
list
,
int
nextIndex
)
{
if
(
codesList
==
null
||
codesList
.
size
()
==
0
)
{
return
;
return
list
;
}
Map
<
String
,
String
>
dicdata
=
contractRepository
.
findByContractCode
(
codesList
).
stream
().
collect
(
Collectors
.
toMap
(
p
->
p
[
0
].
toString
(),
p
->
p
[
nextIndex
].
toString
(),
(
key1
,
key2
)
->
key1
));
list
.
stream
().
filter
(
p
->
authdata
.
get
(
dicdata
.
get
(
p
.
getContractCode
()))
==
null
?
false
:
true
).
collect
(
Collectors
.
toList
());
return
list
.
stream
().
filter
(
p
->
authdata
.
get
(
dicdata
.
get
(
p
.
getContractCode
()))
==
null
?
false
:
true
).
collect
(
Collectors
.
toList
());
}
...
...
kangxiaoshan
@kangxiaoshan
mentioned in commit
cfb5aeb5
Oct 21, 2019
mentioned in commit
cfb5aeb5
mentioned in commit cfb5aeb5cbfeb48c3bf6a2c131c257e48e46c727
Toggle commit list
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