记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
9e8bfedd
Commit
9e8bfedd
authored
Dec 20, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 列表 查看销售统计列表不显示
parent
99537807
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
KylinPerformancesPartnerServiceImpl.java
...ime/service/impl/KylinPerformancesPartnerServiceImpl.java
+2
-2
MongoSlimeUtils.java
...ava/com/liquidnet/service/slime/util/MongoSlimeUtils.java
+2
-1
No files found.
liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/service/impl/KylinPerformancesPartnerServiceImpl.java
View file @
9e8bfedd
...
@@ -186,7 +186,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
...
@@ -186,7 +186,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20104
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20104
));
}
}
if
(!
mongoSlimeUtils
.
judgeIsPermission
(
performancesId
,
merchantId
,
new
String
[]{
if
(!
mongoSlimeUtils
.
judgeIsPermission
(
performancesId
,
merchantId
,
new
String
[]{
SlimeAuthorizationConst
.
PerformancePermission
.
EDIT
.
getId
(),
SlimeAuthorizationConst
.
PerformancePermission
.
EDIT
.
getId
(),
SlimeAuthorizationConst
.
PerformancePermission
.
READ
.
getId
(),
}))
{
}))
{
List
<
String
>
fieldsIdList
=
slimeRdmService
.
getFieldAppliesVosByUid
(
merchantId
).
stream
().
map
(
SlimeFieldAppliesVo:
:
getFieldId
).
collect
(
Collectors
.
toList
());
List
<
String
>
fieldsIdList
=
slimeRdmService
.
getFieldAppliesVosByUid
(
merchantId
).
stream
().
map
(
SlimeFieldAppliesVo:
:
getFieldId
).
collect
(
Collectors
.
toList
());
if
(!(
data
.
getMerchantId
().
equals
(
merchantId
)
||
fieldsIdList
.
contains
(
data
.
getFieldId
())))
{
if
(!(
data
.
getMerchantId
().
equals
(
merchantId
)
||
fieldsIdList
.
contains
(
data
.
getFieldId
())))
{
...
@@ -474,7 +474,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
...
@@ -474,7 +474,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20104
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20104
));
}
}
if
(!
mongoSlimeUtils
.
judgeIsPermission
(
performancesId
,
merchantId
,
new
String
[]{
if
(!
mongoSlimeUtils
.
judgeIsPermission
(
performancesId
,
merchantId
,
new
String
[]{
SlimeAuthorizationConst
.
PerformancePermission
.
EDIT
.
getId
(),
SlimeAuthorizationConst
.
PerformancePermission
.
EDIT
.
getId
(),
SlimeAuthorizationConst
.
PerformancePermission
.
READ
.
getId
(),
}))
{
}))
{
List
<
String
>
fieldsIdList
=
slimeRdmService
.
getFieldAppliesVosByUid
(
merchantId
).
stream
().
map
(
SlimeFieldAppliesVo:
:
getFieldId
).
collect
(
Collectors
.
toList
());
List
<
String
>
fieldsIdList
=
slimeRdmService
.
getFieldAppliesVosByUid
(
merchantId
).
stream
().
map
(
SlimeFieldAppliesVo:
:
getFieldId
).
collect
(
Collectors
.
toList
());
if
(!(
data
.
getMerchantId
().
equals
(
merchantId
)
||
fieldsIdList
.
contains
(
data
.
getFieldId
())))
{
if
(!(
data
.
getMerchantId
().
equals
(
merchantId
)
||
fieldsIdList
.
contains
(
data
.
getFieldId
())))
{
...
...
liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/util/MongoSlimeUtils.java
View file @
9e8bfedd
...
@@ -270,7 +270,8 @@ public class MongoSlimeUtils {
...
@@ -270,7 +270,8 @@ public class MongoSlimeUtils {
permissionVoList
=
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"uid"
).
is
(
performancePartnerListParam
.
getMerchantId
())
permissionVoList
=
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"uid"
).
is
(
performancePartnerListParam
.
getMerchantId
())
.
and
(
"permissionIds"
).
in
(
.
and
(
"permissionIds"
).
in
(
SlimeAuthorizationConst
.
PerformancePermission
.
READ
.
getId
(),
SlimeAuthorizationConst
.
PerformancePermission
.
READ
.
getId
(),
SlimeAuthorizationConst
.
PerformancePermission
.
SALES
.
getId
(),
SlimeAuthorizationConst
.
PerformancePermission
.
EDIT
.
getId
(),
// SlimeAuthorizationConst.PerformancePermission.SALES.getId(),
SlimeAuthorizationConst
.
PerformancePermission
.
LINE
.
getId
())
SlimeAuthorizationConst
.
PerformancePermission
.
LINE
.
getId
())
)
)
.
skip
(((
performancePartnerListParam
.
getPage
()
-
1
)
*
performancePartnerListParam
.
getSize
()))
.
skip
(((
performancePartnerListParam
.
getPage
()
-
1
)
*
performancePartnerListParam
.
getSize
()))
...
...
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