Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-webapp-plug
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-webapp-plug
Commits
8882fcf1
Commit
8882fcf1
authored
Jan 15, 2021
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整新的资源组
parent
09ed68a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
StoreController.java
...ain/java/com/gic/plug/web/controller/StoreController.java
+1
-3
StoreRegionAuthUtil.java
...main/java/com/gic/plug/web/utils/StoreRegionAuthUtil.java
+1
-1
No files found.
src/main/java/com/gic/plug/web/controller/StoreController.java
View file @
8882fcf1
...
@@ -108,9 +108,7 @@ public class StoreController {
...
@@ -108,9 +108,7 @@ public class StoreController {
storeSearchDTO
.
setEnterpriseId
(
enterpriseId
);
storeSearchDTO
.
setEnterpriseId
(
enterpriseId
);
storeSearchDTO
.
setStoreGroupId
(
storeGroupId
);
storeSearchDTO
.
setStoreGroupId
(
storeGroupId
);
storeSearchDTO
.
setSearch
(
search
);
storeSearchDTO
.
setSearch
(
search
);
if
(
UserDetailUtils
.
getUserDetail
().
getStoreResourceInfo
()
!=
null
){
storeSearchDTO
.
setStoreResource
(
UserDetailUtils
.
getUserDetail
().
getStoreResourceId
());
storeSearchDTO
.
setStoreResource
(
Long
.
valueOf
(
UserDetailUtils
.
getUserDetail
().
getStoreResourceInfo
().
getStoreResourceId
()));
}
String
returnFields
=
StoreESFieldsEnum
.
STOREID
.
getField
()+
","
+
StoreESFieldsEnum
.
STORECODE
.
getField
()+
","
+
StoreESFieldsEnum
.
STORENAME
.
getField
();
String
returnFields
=
StoreESFieldsEnum
.
STOREID
.
getField
()+
","
+
StoreESFieldsEnum
.
STORECODE
.
getField
()+
","
+
StoreESFieldsEnum
.
STORENAME
.
getField
();
ServiceResponse
serviceResponse
=
storeApiService
.
listStore
(
storeSearchDTO
,
ServiceResponse
serviceResponse
=
storeApiService
.
listStore
(
storeSearchDTO
,
1
,
100
,
returnFields
);
1
,
100
,
returnFields
);
...
...
src/main/java/com/gic/plug/web/utils/StoreRegionAuthUtil.java
View file @
8882fcf1
...
@@ -26,7 +26,7 @@ public class StoreRegionAuthUtil {
...
@@ -26,7 +26,7 @@ public class StoreRegionAuthUtil {
Set
<
String
>
authRegionSet
=
new
HashSet
<>();
Set
<
String
>
authRegionSet
=
new
HashSet
<>();
UserDetail
userDetail
=
UserDetailUtils
.
getUserDetail
();
UserDetail
userDetail
=
UserDetailUtils
.
getUserDetail
();
if
(
userDetail
.
getUserInfo
().
getSuperAdmin
()
!=
1
&&
userDetail
.
getStoreResourceInfo
()
!=
null
){
if
(
userDetail
.
getUserInfo
().
getSuperAdmin
()
!=
1
&&
userDetail
.
getStoreResourceInfo
()
!=
null
){
Long
storeResource
=
Long
.
valueOf
(
userDetail
.
getStoreResourceI
nfo
().
getStoreResourceI
d
());
Long
storeResource
=
Long
.
valueOf
(
userDetail
.
getStoreResourceId
());
if
(
storeResource
!=
null
){
if
(
storeResource
!=
null
){
ServiceResponse
<
StoreWidgetDTO
>
storeWidget
=
storeWidgetApiService
.
getStoreWidget
(
storeResource
.
intValue
());
ServiceResponse
<
StoreWidgetDTO
>
storeWidget
=
storeWidgetApiService
.
getStoreWidget
(
storeResource
.
intValue
());
if
(
storeWidget
.
getResult
()
!=
null
){
if
(
storeWidget
.
getResult
()
!=
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