Commit db2c5548 by 陶光胜

Merge branch 'developer' into 'master'

小程序二维码修改

See merge request !48
parents 8536437e 68a0dfc4
...@@ -147,7 +147,7 @@ public class IndexModuleController { ...@@ -147,7 +147,7 @@ public class IndexModuleController {
ServiceResponse<List<ProvinceDTO>> serviceResponse = this.provincesApiService.selectAllProvince(); ServiceResponse<List<ProvinceDTO>> serviceResponse = this.provincesApiService.selectAllProvince();
List<Integer> authStoreIdList = new ArrayList<>(); List<Integer> authStoreIdList = new ArrayList<>();
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){ 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.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
if(authResponse.isSuccess()){ if(authResponse.isSuccess()){
authStoreIdList = authResponse.getResult(); authStoreIdList = authResponse.getResult();
} }
...@@ -213,7 +213,7 @@ public class IndexModuleController { ...@@ -213,7 +213,7 @@ public class IndexModuleController {
} }
List<Integer> authStoreIdList = new ArrayList<>(); List<Integer> authStoreIdList = new ArrayList<>();
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){ 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.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
if(authResponse.isSuccess()){ if(authResponse.isSuccess()){
authStoreIdList = authResponse.getResult(); 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