Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
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
haoban3.0
haoban-manage3.0
Commits
12a2f6a7
Commit
12a2f6a7
authored
May 26, 2022
by
徐高华
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://git.gicdev.com/haoban3.0/haoban-manage3.0.git
into developer
parents
900e638d
40645e9f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
StaffApiServiceImpl.java
.../manage/service/service/out/impl/StaffApiServiceImpl.java
+4
-2
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
View file @
12a2f6a7
...
...
@@ -1306,7 +1306,9 @@ public class StaffApiServiceImpl implements StaffApiService {
return
Collections
.
emptyList
();
}
List
<
String
>
enterpriseIdStoreIds
=
storeRangeService
.
listStoreIdByWxEnterpriseId
(
wxEnterpriseId
,
clerkDTO
.
getEnterpriseId
());
logger
.
info
(
"好办门店id:{}"
,
JSON
.
toJSONString
(
enterpriseIdStoreIds
));
if
(
CollectionUtils
.
isNotEmpty
(
enterpriseIdStoreIds
))
{
logger
.
info
(
"好办门店id数量:{}"
,
enterpriseIdStoreIds
.
size
());
}
List
<
String
>
gicStoreIds
=
getStoreIdList
(
clerkId
);
if
(
CollectionUtils
.
isEmpty
(
gicStoreIds
))
{
logger
.
info
(
"gic门店为空"
);
...
...
@@ -1319,7 +1321,7 @@ public class StaffApiServiceImpl implements StaffApiService {
//取交集
Sets
.
SetView
<
String
>
intersection
=
Sets
.
intersection
(
Sets
.
newHashSet
(
enterpriseIdStoreIds
),
Sets
.
newHashSet
(
gicStoreIds
));
List
<
String
>
storeList
=
intersection
.
stream
().
collect
(
Collectors
.
toList
());
logger
.
info
(
"该导购权限:clerkId:{},门店
:{}"
,
clerkId
,
JSON
.
toJSONString
(
storeList
));
logger
.
info
(
"该导购权限:clerkId:{},门店
数量:{}"
,
clerkId
,
storeList
.
size
(
));
return
storeList
;
}
...
...
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