Commit 08912007 by guojuxing

调整新的资源组

parent d2d7fd5c
......@@ -145,7 +145,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.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(authResponse.isSuccess()){
authStoreIdList = authResponse.getResult();
}
......@@ -211,7 +211,7 @@ public class IndexModuleController {
}
List<Integer> authStoreIdList = new ArrayList<>();
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(authResponse.isSuccess()){
authStoreIdList = authResponse.getResult();
}
......@@ -369,7 +369,7 @@ public class IndexModuleController {
storeSearchDTO.setStatus(status);
storeSearchDTO.setProvinceId(provinceId);
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
Long storeResource = UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource();
Long storeResource = Long.valueOf(UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(storeResource != null){
storeSearchDTO.setStoreResource(storeResource);
}
......@@ -385,7 +385,7 @@ public class IndexModuleController {
storeSearchDTO.setProvinceId(provinceId);
storeSearchDTO.setCityId(cityId);
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
Long storeResource = UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource();
Long storeResource = Long.valueOf(UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(storeResource != null){
storeSearchDTO.setStoreResource(storeResource);
}
......@@ -398,10 +398,10 @@ public class IndexModuleController {
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
List<Integer> authStoreIdList = new ArrayList<>();
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
if (UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource() == null) {
if (UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId() == null) {
authStoreIdList.add(-1);
} else {
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(authResponse.isSuccess()){
authStoreIdList = authResponse.getResult();
}
......
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