Merge remote-tracking branch 'upstream/master'

zqburde · zqburde · commit 7371d38b8e61 · 2022-11-16T16:19:11.000+08:00
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/dolphinscheduler/conversion/WorkflowToDolphinSchedulerSynchronizer.java b/dss-appconn/appconns/dss-dolphinscheduler-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/dolphinscheduler/conversion/WorkflowToDolphinSchedulerSynchronizer.java
@@ -51,7 +51,7 @@ private void checkSchedulerProject(Workflow flow) throws ExternalOperationFailed
         List<WorkflowNode> nodes = flow.getWorkflowNodes();
         for (WorkflowNode node : nodes) {
             DSSNode dssNode = node.getDSSNode();
-            if (CollectionUtils.isEmpty(dssNode.getResources())) {
+            if (CollectionUtils.isEmpty(dssNode.getResources()) && dssNode.getJobContent().isEmpty()) {
                 throw new ExternalOperationFailedException(90021, dssNode.getName() + "节点内容不能为空");
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ private void checkSchedulerProject(Workflow flow) throws ExternalOperationFailed`
`51`	`51`	`List<WorkflowNode> nodes = flow.getWorkflowNodes();`
`52`	`52`	`for (WorkflowNode node : nodes) {`
`53`	`53`	`DSSNode dssNode = node.getDSSNode();`
`54`		`- if (CollectionUtils.isEmpty(dssNode.getResources())) {`
	`54`	`+ if (CollectionUtils.isEmpty(dssNode.getResources()) && dssNode.getJobContent().isEmpty()) {`
`55`	`55`	`throw new ExternalOperationFailedException(90021, dssNode.getName() + "节点内容不能为空");`
`56`	`56`	`}`
`57`	`57`	`}`