Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-store
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
base_platform_enterprise
gic-store
Commits
00adb7a3
Commit
00adb7a3
authored
Feb 28, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://115.159.76.241/base_platform_enterprise/gic-store
into developer
parents
5ca9b78a
68dd8ede
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletions
+4
-1
StoreOpenApiServiceImpl.java
...gic/store/service/outer/impl/StoreOpenApiServiceImpl.java
+4
-1
No files found.
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreOpenApiServiceImpl.java
View file @
00adb7a3
...
...
@@ -576,6 +576,9 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
// }
//门店域有权限,但是域下面的门店不一定都有权限,进行过滤
storeIds
=
getStoreIds
(
appId
,
enterpriseId
,
regionId
);
if
(
StringUtils
.
isBlank
(
storeIds
.
toString
()))
{
return
ServiceResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"没有门店权限"
);
}
}
else
{
StoreDTO
store
=
storeService
.
getStoreByRegionIdAndStoreCode
(
enterpriseId
,
regionId
,
storeCode
);
if
(
store
==
null
)
{
...
...
@@ -668,7 +671,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
Long
storeResourceId
=
resourceResult
.
getResult
().
getStoreResource
();
//查询门店资源组所有的门店权限
ServiceResponse
<
Page
<
StoreDTO
>>
storeResult
=
storeWidgetApiService
.
listStoreByStoreWidgetId
(
enterpriseId
,
storeResourceId
.
intValue
(),
0
,
10000
);
.
listStoreByStoreWidgetId
(
enterpriseId
,
storeResourceId
.
intValue
(),
1
,
10000
);
if
(
storeResult
.
isSuccess
())
{
Page
<
StoreDTO
>
page
=
storeResult
.
getResult
();
if
(
page
==
null
)
{
...
...
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