From da027b817009846ddf7421ad84f4289337f7394e Mon Sep 17 00:00:00 2001 From: ulleo Date: Fri, 5 Apr 2024 22:40:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E4=BB=BB=E5=8A=A1=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=81=9C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/datafill/DataFillTaskService.java | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillTaskService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillTaskService.java index ab2dff80e0..a6ef77d330 100644 --- a/core/backend/src/main/java/io/dataease/service/datafill/DataFillTaskService.java +++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillTaskService.java @@ -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());