Commit 8882fcf1 by guojuxing

调整新的资源组

parent 09ed68a0
...@@ -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);
......
...@@ -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.getStoreResourceInfo().getStoreResourceId()); 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){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment