From 58f02b5eecde704ea1d3da649a498e1a6f42a690 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 7 Dec 2023 17:57:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=84=B1=E6=95=8F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=94=B9=E4=B8=BA=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/manage/DatasetTableFieldManage.java      |  5 +++--
 core/core-frontend/src/api/chart.ts                  |  1 +
 .../v-query/QueryConditionConfiguration.vue          | 12 ++++++++++--
 .../dataease/dto/dataset/DatasetTableFieldDTO.java   |  7 ++++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
index 4525e2fa15..08bf01ada9 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
@@ -193,12 +193,13 @@ public class DatasetTableFieldManage {
         List<DatasetTableFieldDTO> fields = selectByDatasetGroupId(id);
         Map<String, ColumnPermissionItem> desensitizationList = new HashMap<>();
         Long userId = AuthUtils.getUser() == null ? null : AuthUtils.getUser().getUserId();
-        return permissionManage
+        List<DatasetTableFieldDTO> tmp = permissionManage
                 .filterColumnPermissions(fields, desensitizationList, id, userId)
                 .stream()
-                .filter(o -> !desensitizationList.containsKey(o.getDataeaseName()))
                 .sorted(Comparator.comparing(DatasetTableFieldDTO::getGroupType))
                 .toList();
+        tmp.forEach(ele -> ele.setDesensitized(desensitizationList.containsKey(ele.getDataeaseName())));
+        return tmp;
     }
 
 
diff --git a/core/core-frontend/src/api/chart.ts b/core/core-frontend/src/api/chart.ts
index 36f130619b..4e9916e221 100644
--- a/core/core-frontend/src/api/chart.ts
+++ b/core/core-frontend/src/api/chart.ts
@@ -15,6 +15,7 @@ export interface Field {
   extField: number
   checked: boolean
   fieldShortName: string
+  desensitized: boolean
 }
 
 export interface ComponentInfo {
diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 94a84ca605..ea1af84f5e 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -836,8 +836,12 @@ defineExpose({
                   :key="ele.id"
                   :label="ele.name"
                   :value="ele.id"
+                  :disabled="ele.desensitized"
                 >
-                  <div class="flex-align-center icon">
+                  <div
+                    class="flex-align-center icon"
+                    :title="ele.desensitized ? '脱敏字段，不能被设置为查询条件' : ''"
+                  >
                     <el-icon>
                       <Icon
                         :name="`field_${fieldType[ele.deType]}`"
@@ -986,8 +990,12 @@ defineExpose({
                       :key="ele.id"
                       :label="ele.name"
                       :value="ele.id"
+                      :disabled="ele.desensitized"
                     >
-                      <div class="flex-align-center icon">
+                      <div
+                        class="flex-align-center icon"
+                        :title="ele.desensitized ? '脱敏字段，不能被设置为查询条件' : ''"
+                      >
                         <el-icon>
                           <Icon
                             :name="`field_${fieldType[ele.deType]}`"
diff --git a/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java b/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java
index b8ed690f3a..6418d63026 100644
--- a/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java
+++ b/sdk/common/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java
@@ -121,4 +121,9 @@ public class DatasetTableFieldDTO implements Serializable {
      * 字段short name
      */
     private String fieldShortName;
-}
\ No newline at end of file
+
+    /**
+     * 是否脱敏
+     */
+    private Boolean desensitized;
+}