dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8962 from dataease/dev

Browse Source 
merge 1.18.18
This commit is contained in:
fit2cloudrd 2024-04-06 09:15:58 +08:00 committed by GitHub
commit 6d5aa20e83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/backend/src/main/java/io/dataease/service/datafill/DataFillTaskService.java
View File

@ -98,22 +98,30 @@ public class DataFillTaskService {
request.setCreateTime(new Date());
}
DataFillTaskExample example = new DataFillTaskExample();
DataFillTaskExample.Criteria criteria = example.createCriteria()
.andFormIdEqualTo(formId)
.andNameEqualTo(request.getName());
if (StringUtils.isNotBlank(request.getName())) {
DataFillTaskExample example = new DataFillTaskExample();
DataFillTaskExample.Criteria criteria = example.createCriteria()
.andFormIdEqualTo(formId)
.andNameEqualTo(request.getName());
if (insert) {
if (dataFillTaskMapper.countByExample(example) > 0) {
DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_EXIST"));
if (insert) {
if (dataFillTaskMapper.countByExample(example) > 0) {
DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_EXIST"));
}
dataFillTaskMapper.insertSelective(request);
} else {
criteria.andIdNotEqualTo(request.getId());
if (dataFillTaskMapper.countByExample(example) > 0) {
DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_EXIST"));
}
dataFillTaskMapper.updateByPrimaryKeySelective(request);
}
dataFillTaskMapper.insertSelective(request);
} else {
criteria.andIdNotEqualTo(request.getId());
if (dataFillTaskMapper.countByExample(example) > 0) {
DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_EXIST"));
if (insert) {
dataFillTaskMapper.insertSelective(request);
} else {
dataFillTaskMapper.updateByPrimaryKeySelective(request);
}
dataFillTaskMapper.updateByPrimaryKeySelective(request);
}
DataFillTaskWithBLOBs task = dataFillTaskMapper.selectByPrimaryKey(request.getId());