diff --git a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java index c0b8a9f2..da45c31e 100644 --- a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java +++ b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java @@ -93,6 +93,10 @@ public class SysIotModelController { /** 获取物模型属性列表 */ @PostMapping("/attribute/list") public PageDataInfo querySysIotModelField(@RequestBody SysIotModelFieldDto sysIotModelFieldDto) { + boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_VIEW_CONFIDENTIAL_DATA.toString()); + if (!hasPermission){ + sysIotModelFieldDto.setConfidential(0); + } if (sysIotModelFieldDto.getPageNum() == null && sysIotModelFieldDto.getPageSize() == null){ List sysIotModelFieldVos = sysIotModelService.queryAllModelField(sysIotModelFieldDto); return PageDataInfo.build(sysIotModelFieldVos,sysIotModelFieldVos.size()); diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml index c995d95d..9cc9a998 100644 --- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml +++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml @@ -31,6 +31,9 @@ and t.subsystem = #{info.subSystem} + + and t.confidential = #{info.confidential} + order by ${info.orderColumn} ${info.orderType}