Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -190,9 +190,7 @@ public class StoreController extends DownloadUtils {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
         storeSearchDTO.setEnterpriseId(enterpriseId);
-        if(UserDetailUtils.getUserDetail().getStoreResourceInfo() != null){
-            storeSearchDTO.setStoreResource(Long.valueOf(UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId()));
-        }
+        storeSearchDTO.setStoreResource(UserDetailUtils.getUserDetail().getStoreResourceId());
 
         //门店标签
         ServiceResponse<StoreTagDTO> storeTagResult = storeTagApiService.getByStoreTagId(storeSearchDTO.getStoreTagId());
@@ -261,9 +259,7 @@ public class StoreController extends DownloadUtils {
         }
         storeSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         storeSearchDTO.setStatus(StoreStatusEnum.ONLINE.getCode());
-        if(UserDetailUtils.getUserDetail().getStoreResourceInfo() != null){
-            storeSearchDTO.setStoreResource(Long.valueOf(UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId()));
-        }
+        storeSearchDTO.setStoreResource(UserDetailUtils.getUserDetail().getStoreResourceId());
         ServiceResponse<Long> response = this.storeApiService.queryStoreCountFromEs(storeSearchDTO);
         return RestResponse.success(response.getResult());
     }