diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java index 0d5871f81..9e72e948f 100644 --- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java +++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java @@ -16,6 +16,7 @@ package com.webank.wedatasphere.dss.orchestrator.server.service.impl; +import cn.hutool.core.util.StrUtil; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.JsonArray; @@ -538,7 +539,7 @@ private void updateOrchestratorNotContainsKeywordsNode(OrchestratorSubmitRequest // 获取内容并检查 List nodePathList = getNotContainsKeywordsNodePath(paths, commitId, workspace, flowRequest.getProjectName(), username); - String notContainsKeywordsNode = StringUtils.joinWith(",",nodePathList); + String notContainsKeywordsNode = StrUtil.join(",",nodePathList); orchestratorMapper.updateOrchestratorNotContainsKeywordsNode(flowRequest.getOrchestratorId(), notContainsKeywordsNode); } diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml index 236ad9a99..bc0f2e762 100644 --- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml +++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml @@ -528,7 +528,7 @@ ,t2.associate_git as associateGit from dss_orchestrator_info t1 left join dss_project t2 on t1.project_id = t2.id - where id in + where t1.id in #{orchestratorId}