From dcd598aab26a573b3aacf10229b0766bcccc754f Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Tue, 17 Dec 2024 09:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=8F=E6=84=9F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/equipment/controller/SysIotModelController.java   | 4 ++++
 das/src/main/resources/mapper/SysIotModelFieldMapper.xml      | 3 +++
 2 files changed, 7 insertions(+)

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<SysIotModelFieldVo> 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<SysIotModelFieldVo> 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 @@
             <if test="info.subSystem != null and info.subSystem != ''">
                 and t.subsystem = #{info.subSystem}
             </if>
+            <if test="info.subSystem != null and info.subSystem != ''">
+                and t.confidential = #{info.confidential}
+            </if>
         </where>
         <if test="info.orderColumn != null and info.orderType != ''">
             order by ${info.orderColumn}  ${info.orderType}