diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java index 3b425c08c..321c6f9e8 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java @@ -39,6 +39,8 @@ public class TenantSecurityWebFilter extends ApiRequestFilter { private static final String INNER_PROFILE = "inner"; private static final List INNER_IGNORE_URLS = Arrays.asList( "/admin-api/iot/device-operation-record/runOverview", + "/admin-api/iot/device/page", + "/admin-api/mes/organization/list", "/admin-api/mes/device-line/deviceParameterAnalysis", "/admin-api/mes/device-ledger/list", "/admin-api/mes/energy-type/list", diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java index ed266945c..54c474f4d 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java +++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java @@ -55,6 +55,8 @@ public class YudaoWebSecurityConfigurerAdapter { private static final String HOME_INFO_PERMIT_ALL_URL = "/admin-api/home/info/**"; private static final List RUN_OVERVIEW_PERMIT_ALL_URLS = Arrays.asList( "/admin-api/iot/device-operation-record/runOverview", + "/admin-api/iot/device/page", + "/admin-api/mes/organization/list", "/admin-api/mes/device-line/deviceParameterAnalysis", "/admin-api/mes/device-ledger/list", "/admin-api/mes/energy-type/list", diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java index 0d7cef904..d735861b7 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java @@ -109,7 +109,7 @@ public class DeviceController { @GetMapping("/page") @Operation(summary = "获得物联设备分页") - @PreAuthorize("@ss.hasPermission('iot:device:query')") + @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('iot:device:query')") public CommonResult> getDevicePage(@Valid DevicePageReqVO pageReqVO) { PageResult pageResult = deviceService.getDevicePage(pageReqVO); return success(pageResult); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java index 696a50f56..883d1d0dc 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java @@ -67,7 +67,7 @@ public class OrganizationController { @GetMapping("/list") @Operation(summary = "获得产线工位列表") - @PreAuthorize("@ss.hasPermission('mes:organization:query')") + @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('mes:organization:query')") public CommonResult> getOrganizationList(@Valid OrganizationListReqVO listReqVO) { List list = organizationService.getOrganizationList(listReqVO); return success(organizationService.buildVOList(list)); @@ -113,4 +113,4 @@ public class OrganizationController { // } -} \ No newline at end of file +}