feat: 行权限支持"与/或"

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -468,7 +468,6 @@ public class DataSetTableService {
         return field;
     }
 
-
     public List<ChartFieldCustomFilterDTO> getCustomFilters(List<DatasetTableField> fields, DatasetTable datasetTable) {
         List<ChartFieldCustomFilterDTO> 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);
             }
         });

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`)