调整新的资源组

src/main/java/com/gic/plug/web/controller/StoreController.java

@@ -108,8 +108,8 @@ public class StoreController {
         storeSearchDTO.setEnterpriseId(enterpriseId);
         storeSearchDTO.setStoreGroupId(storeGroupId);
         storeSearchDTO.setSearch(search);
-        if(UserDetailUtils.getUserDetail().getUserResourceInfo() != null){
-            storeSearchDTO.setStoreResource(UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource());
+        if(UserDetailUtils.getUserDetail().getStoreResourceInfo() != null){
+            storeSearchDTO.setStoreResource(Long.valueOf(UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId()));
         }
         String returnFields = StoreESFieldsEnum.STOREID.getField()+","+StoreESFieldsEnum.STORECODE.getField()+","+StoreESFieldsEnum.STORENAME.getField();
         ServiceResponse serviceResponse = storeApiService.listStore(storeSearchDTO,

src/main/java/com/gic/plug/web/controller/goods/GoodsBrandController.java

@@ -59,8 +59,8 @@ public class GoodsBrandController extends BaseGoodsController {
                 return RestResponse.success(Collections.EMPTY_LIST);
             }
         } else {
-            Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
-                    UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+            Long resourceId = UserDetailUtils.getUserDetail().getGoodsResourceInfo() == null ? null :
+                    UserDetailUtils.getUserDetail().getGoodsResourceInfo().getGoodsResourceId();
             ServiceResponse<GoodsRightsSelectorDTO> selectorDtoServiceResponse = goodsRightsSelectorApiService
                     .getGoodsRightsSelector(resourceId, getEnterpriseId()
                             , UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());

src/main/java/com/gic/plug/web/controller/goods/GoodsDomainController.java

@@ -78,8 +78,8 @@ public class GoodsDomainController extends BaseGoodsController {
                 return RestResponse.success(Collections.EMPTY_LIST);
             }
         } else {
-            Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
-                    UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+            Long resourceId = UserDetailUtils.getUserDetail().getGoodsResourceInfo() == null ? null :
+                    UserDetailUtils.getUserDetail().getGoodsResourceInfo().getGoodsResourceId();
             ServiceResponse<GoodsRightsSelectorDTO> selectorDtoServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                     getEnterpriseId(), UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
             if (!selectorDtoServiceResponse.isSuccess() || selectorDtoServiceResponse.getResult() == null ||

src/main/java/com/gic/plug/web/controller/goods/GoodsSelectorController.java

@@ -68,8 +68,8 @@ public class GoodsSelectorController extends BaseGoodsController {
     public RestResponse goodsSelectorSave(GoodsSelectorSaveQO goodsSelectorSaveQO) {
         GoodsSelectorDTO goodsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsSelectorDTO.class, goodsSelectorSaveQO);
         goodsSelectorDTO.setEnterpriseId(getEnterpriseId());
-        Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
-                UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+        Long resourceId = UserDetailUtils.getUserDetail().getGoodsResourceInfo() == null ? null :
+                UserDetailUtils.getUserDetail().getGoodsResourceInfo().getGoodsResourceId();
         ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDtoServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                 getEnterpriseId(), UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!goodsRightsSelectorDtoServiceResponse.isSuccess()) {
@@ -94,8 +94,8 @@ public class GoodsSelectorController extends BaseGoodsController {
     public RestResponse goodsSelectorShow(GoodsSelectorSaveQO goodsSelectorSaveQO) {
         GoodsSelectorDTO goodsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsSelectorDTO.class, goodsSelectorSaveQO);
         goodsSelectorDTO.setEnterpriseId(getEnterpriseId());
-        Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
-                UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+        Long resourceId = UserDetailUtils.getUserDetail().getGoodsResourceInfo() == null ? null :
+                UserDetailUtils.getUserDetail().getGoodsResourceInfo().getGoodsResourceId();
         ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDtoServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                 getEnterpriseId(), UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!goodsRightsSelectorDtoServiceResponse.isSuccess()) {
@@ -118,7 +118,7 @@ public class GoodsSelectorController extends BaseGoodsController {
     @RequestMapping("change-goods-rights-for-selector")
     public RestResponse changeGoodsRightsForSelector(Long goodsSelectorId) {
         if (goodsSelectorId == null) {
-            Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null:UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+            Long resourceId = UserDetailUtils.getUserDetail().getGoodsResourceInfo() == null ? null:UserDetailUtils.getUserDetail().getGoodsResourceInfo().getGoodsResourceId();
             ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                     getEnterpriseId(), UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
             if (serviceResponse.getResult() == null) {
@@ -130,8 +130,8 @@ public class GoodsSelectorController extends BaseGoodsController {
             goodsRightsSelectorDTO.setGoodsRightsSearchValue(serviceResponse.getResult().getGoodsRightsSearchValue());
             return RestResponse.success(goodsRightsSelectorDTO);
         }
-        Long resourceId = UserDetailUtils.getUserDetail().getUserResourceInfo() == null ? null :
-                UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId();
+        Long resourceId = UserDetailUtils.getUserDetail().getGoodsResourceInfo() == null ? null :
+                UserDetailUtils.getUserDetail().getGoodsResourceInfo().getGoodsResourceId();
         ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDtoServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(resourceId,
                 getEnterpriseId(), UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin());
         if (!goodsRightsSelectorDtoServiceResponse.isSuccess()) {

src/main/java/com/gic/plug/web/utils/StoreRegionAuthUtil.java

@@ -25,8 +25,8 @@ public class StoreRegionAuthUtil {
     public static Set<String> getUserRegion(StoreWidgetApiService storeWidgetApiService){
         Set<String> authRegionSet = new HashSet<>();
         UserDetail userDetail = UserDetailUtils.getUserDetail();
-        if(userDetail.getUserInfo().getSuperAdmin() != 1 && userDetail.getUserResourceInfo() != null){
-            Long storeResource = userDetail.getUserResourceInfo().getStoreResource();
+        if(userDetail.getUserInfo().getSuperAdmin() != 1 && userDetail.getStoreResourceInfo() != null){
+            Long storeResource = Long.valueOf(userDetail.getStoreResourceInfo().getStoreResourceId());
             if(storeResource != null){
                 ServiceResponse<StoreWidgetDTO> storeWidget = storeWidgetApiService.getStoreWidget(storeResource.intValue());
                 if(storeWidget.getResult() != null){

src/main/java/com/gic/plug/web/utils/StoreResourceAuthUtils.java

@@ -32,7 +32,7 @@ public class StoreResourceAuthUtils {
      */
     public static Set<String> getAuthData(String field, StoreWidgetApiService storeWidgetApiService) {
         UserDetail userDetail = UserDetailUtils.getUserDetail();
-        boolean isAdmin = userDetail.getUserInfo().getSuperAdmin() == 1 || userDetail.getUserResourceInfo() == null;
+        boolean isAdmin = userDetail.getUserInfo().getSuperAdmin() == 1 || userDetail.getStoreResourceInfo() == null;
         //超管
         if (isAdmin) {
             return getAuthDataWhenAdmin();
@@ -106,8 +106,7 @@ public class StoreResourceAuthUtils {
      * @return
      */
     private static Integer getStoreWidgetId() {
-        //todo 前端资源组对齐后，调整最新接口
-        return UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue();
+        return UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId();
     }
 
     private static boolean isStoreField(String field) {