Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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-platform-enterprise
Commits
db2c5548
Commit
db2c5548
authored
Aug 27, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' into 'master'
小程序二维码修改 See merge request
!48
parents
8536437e
68a0dfc4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
IndexModuleController.java
.../gic/enterprise/web/controller/IndexModuleController.java
+2
-2
No files found.
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java
View file @
db2c5548
...
...
@@ -147,7 +147,7 @@ public class IndexModuleController {
ServiceResponse
<
List
<
ProvinceDTO
>>
serviceResponse
=
this
.
provincesApiService
.
selectAllProvince
();
List
<
Integer
>
authStoreIdList
=
new
ArrayList
<>();
if
(
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
()
!=
1
){
ServiceResponse
<
List
<
Integer
>>
authResponse
=
this
.
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
enterpriseId
,
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getStoreResource
().
intValue
());
ServiceResponse
<
List
<
Integer
>>
authResponse
=
this
.
storeWidgetApiService
.
listStoreI
nfoI
dByStoreWidgetId
(
enterpriseId
,
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getStoreResource
().
intValue
());
if
(
authResponse
.
isSuccess
()){
authStoreIdList
=
authResponse
.
getResult
();
}
...
...
@@ -213,7 +213,7 @@ public class IndexModuleController {
}
List
<
Integer
>
authStoreIdList
=
new
ArrayList
<>();
if
(
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getSuperAdmin
()
!=
1
){
ServiceResponse
<
List
<
Integer
>>
authResponse
=
this
.
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
enterpriseId
,
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getStoreResource
().
intValue
());
ServiceResponse
<
List
<
Integer
>>
authResponse
=
this
.
storeWidgetApiService
.
listStoreI
nfoI
dByStoreWidgetId
(
enterpriseId
,
UserDetailUtils
.
getUserDetail
().
getUserResourceInfo
().
getStoreResource
().
intValue
());
if
(
authResponse
.
isSuccess
()){
authStoreIdList
=
authResponse
.
getResult
();
}
...
...
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