center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 字段重名

Browse Source
This commit is contained in:
xiajunjie 2021-12-30 20:31:01 +08:00
parent 0c8d930ee5
commit 7812d73545
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java
View File

@ -3,7 +3,9 @@ package io.dataease.service.dataset;
import io.dataease.base.domain.DatasetTableField;
import io.dataease.base.domain.DatasetTableFieldExample;
import io.dataease.base.mapper.DatasetTableFieldMapper;
import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.DorisTableUtils;
import io.dataease.i18n.Translator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
@ -30,6 +32,12 @@ public class DataSetTableFieldsService {
}
public DatasetTableField save(DatasetTableField datasetTableField) {
DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample();
datasetTableFieldExample.createCriteria().andNameEqualTo(datasetTableField.getName()).andTableIdEqualTo(datasetTableField.getTableId());
List<DatasetTableField> datasetTableFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample);
if (CollectionUtils.isNotEmpty(datasetTableFields)) {
DEException.throwException(Translator.get("i18n_field_name_repeat"));
}
if (StringUtils.isEmpty(datasetTableField.getId())) {
datasetTableField.setId(UUID.randomUUID().toString());
// 若dataeasename为空，则用MD5(id)作为dataeasename

3
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -297,4 +297,5 @@ i18n_invalid_ds=Invalid Datasource
任务管理=Task Manager
数据同步=Data Sync
定时报告=Regular report
i18n_rp_exist=Row permission of the same type already exists
i18n_rp_exist=Row permission of the same type already exists
i18n_field_name_repeat=Field name can't repeat

3
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -296,4 +296,5 @@ i18n_invalid_ds=无效数据源
任务管理=任务管理
数据同步=数据同步
定时报告=定时报告
i18n_rp_exist=已有同类型的行权限存在
i18n_rp_exist=已有同类型的行权限存在
i18n_field_name_repeat=字段名不能重复

3
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -299,4 +299,5 @@ i18n_invalid_ds=無效數據源
任务管理=任務管理
数据同步=數據同步
定时报告=定時報告
i18n_rp_exist=已有同類型餓行權限存在
i18n_rp_exist=已有同類型餓行權限存在
i18n_field_name_repeat=字段名不能重復