From 2a0a0983da7c9104b7d03fc32b7adbf4d4d2510a Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 3 Jul 2024 16:12:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DAPI=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/manage/DataSourceManage.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java index c78140fe6e..1eed1b0846 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java @@ -116,6 +116,7 @@ public class DataSourceManage { updateWrapper.eq("id", coreDatasource.getId()); coreDatasource.setUpdateTime(System.currentTimeMillis()); coreDatasource.setUpdateBy(AuthUtils.getUser().getUserId()); + coreDatasource.setTaskStatus(TaskStatus.WaitingForExecution.name()); coreDatasourceMapper.update(coreDatasource, updateWrapper); coreOptRecentManage.saveOpt(coreDatasource.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASOURCE, OptConstants.OPT_TYPE.UPDATE); } @@ -125,7 +126,8 @@ public class DataSourceManage { public void innerEditStatus(CoreDatasource coreDatasource) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", coreDatasource.getId()); - coreDatasourceMapper.update(coreDatasource, updateWrapper); + updateWrapper.set("status", coreDatasource.getStatus()); + coreDatasourceMapper.update(null, updateWrapper); } @@ -136,12 +138,16 @@ public class DataSourceManage { if (ObjectUtils.isEmpty(id) || ObjectUtils.isEmpty(sourceData = coreDatasourceMapper.selectById(id))) { DEException.throwException("resource not exist"); } - sourceData.setUpdateTime(System.currentTimeMillis()); - sourceData.setUpdateBy(AuthUtils.getUser().getUserId()); - sourceData.setPid(dataSourceDTO.getPid()); - sourceData.setName(dataSourceDTO.getName()); checkName(dataSourceDTO); - coreDatasourceMapper.updateById(sourceData); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id); + updateWrapper.set("update_time", System.currentTimeMillis()); + updateWrapper.set("pid", dataSourceDTO.getPid()); + updateWrapper.set("name", dataSourceDTO.getName()); + updateWrapper.set("update_by", AuthUtils.getUser().getUserId()); + coreDatasourceMapper.update(null, updateWrapper); + coreOptRecentManage.saveOpt(sourceData.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASOURCE, OptConstants.OPT_TYPE.UPDATE); }