From 4a7d8efe7cb033d8cd4b1ff666f15e8e9bc0f19d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 14 Dec 2021 16:27:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=8C=E6=9D=83=E9=99=90=E6=94=AF?= =?UTF-8?q?=E6=8C=81"=E4=B8=8E/=E6=88=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/DataSetTableService.java | 3 +-- backend/src/main/resources/db/migration/V29__de1.6.sql | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index cce327dcef..93bc0e9c62 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -468,7 +468,6 @@ public class DataSetTableService { return field; } - public List getCustomFilters(List fields, DatasetTable datasetTable) { List customFilter = new ArrayList<>(); rowPermissions(datasetTable.getId()).forEach(datasetRowPermissions -> { @@ -482,7 +481,7 @@ public class DataSetTableService { dto.setFilter(lists); dto.setField(field); dto.setId(field.getId()); - dto.setLogic("and"); + dto.setLogic(datasetRowPermissions.getLogic()); customFilter.add(dto); } }); diff --git a/backend/src/main/resources/db/migration/V29__de1.6.sql b/backend/src/main/resources/db/migration/V29__de1.6.sql index 6a25e9d936..79c52a4bcf 100644 --- a/backend/src/main/resources/db/migration/V29__de1.6.sql +++ b/backend/src/main/resources/db/migration/V29__de1.6.sql @@ -4,6 +4,7 @@ CREATE TABLE `dataset_row_permissions` ( `auth_target_id` bigint(20) DEFAULT NULL COMMENT '权限对象ID', `dataset_id` varchar(64) DEFAULT NULL COMMENT '数据集ID', `dataset_field_id` varchar(64) DEFAULT NULL COMMENT '数据集字段ID', + `logic` varchar(64) DEFAULT NULL COMMENT '与/或', `filter` longtext DEFAULT NULL COMMENT '数值', `update_time` bigint(13) NULL DEFAULT NULL, PRIMARY KEY (`id`)