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
741190b2
Commit
741190b2
authored
Oct 17, 2019
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限管理
parent
62ae0618
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
AuthServiceImpl.java
src/main/java/common/service/impl/AuthServiceImpl.java
+2
-3
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+3
-3
No files found.
src/main/java/common/service/impl/AuthServiceImpl.java
View file @
741190b2
...
@@ -38,10 +38,9 @@ public class AuthServiceImpl implements AuthService {
...
@@ -38,10 +38,9 @@ public class AuthServiceImpl implements AuthService {
if
(
RoleEnum
.
FINANCE
.
getKey
().
equals
(
loginAccount
.
getRole
())){
if
(
RoleEnum
.
FINANCE
.
getKey
().
equals
(
loginAccount
.
getRole
())){
//财务 按签约主体查看
//财务 按签约主体查看
List
bodyids
=
JSONArray
.
fromObject
(
auth
.
getAuthExtend
());
authArrs
=
JSONArray
.
fromObject
(
auth
.
getAuthExtend
());
authArrs
=
contractBodyRepository
.
findByIds
(
bodyids
);
// authArrs = contractBodyRepository.findByIds(bodyids);
}
else
if
(
RoleEnum
.
SALSEMAN
.
getKey
().
equals
(
loginAccount
.
getRole
())){
}
else
if
(
RoleEnum
.
SALSEMAN
.
getKey
().
equals
(
loginAccount
.
getRole
())){
//销售 按签约合同人查看
//销售 按签约合同人查看
...
...
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
741190b2
...
@@ -1094,15 +1094,15 @@ public class ContractServiceImpl implements ContractService {
...
@@ -1094,15 +1094,15 @@ public class ContractServiceImpl implements ContractService {
// List bodyids = Arrays.asList(loginAccount.getAuthExtend().split(","));
// List bodyids = Arrays.asList(loginAccount.getAuthExtend().split(","));
List
bodyids
=
JSONArray
.
fromObject
(
auth
.
getAuthExtend
());
List
bodyids
=
JSONArray
.
fromObject
(
auth
.
getAuthExtend
());
List
<
String
>
bodycodes
=
contractBodyRepository
.
findByIds
(
bodyids
);
//
List<String> bodycodes = contractBodyRepository.findByIds(bodyids);
if
(!
StringUtils
.
isEmpty
(
contractId
))
{
if
(!
StringUtils
.
isEmpty
(
contractId
))
{
if
(
ids
!=
null
&&
ids
.
size
()
>
0
)
{
if
(
ids
!=
null
&&
ids
.
size
()
>
0
)
{
contractList
=
contractRepository
.
findByDsContractBody
(
startDate
,
endDate
,
platforms
,
body
code
s
,
ids
);
contractList
=
contractRepository
.
findByDsContractBody
(
startDate
,
endDate
,
platforms
,
body
id
s
,
ids
);
}
}
}
else
{
}
else
{
contractList
=
contractRepository
.
findByDsContractBody
(
startDate
,
endDate
,
platform
,
body
code
s
);
contractList
=
contractRepository
.
findByDsContractBody
(
startDate
,
endDate
,
platform
,
body
id
s
);
}
}
}
else
if
(
RoleEnum
.
SALSEMAN
.
getKey
().
equals
(
loginAccount
.
getRole
())){
}
else
if
(
RoleEnum
.
SALSEMAN
.
getKey
().
equals
(
loginAccount
.
getRole
())){
...
...
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