fix: queryDataDevelopNodeList bug 1

SunPengWan · SunPengWan · commit 73de977eb8c0 · 2025-06-12T16:27:33.000+08:00
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -1850,23 +1850,28 @@ public List<DataDevelopNodeInfo> dataDevelopNodeResultFilter(DataDevelopNodeRequ
 
             // 新增 Spark 相关属性筛选
             if (!StringUtils.isBlank(request.getSparkDriverMemory()) && flag) {
-                flag = request.getSparkDriverMemory().contains(dataDevelopNodeInfo.getSparkDriverMemory());
+                flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkDriverMemory())
+                        && dataDevelopNodeInfo.getSparkDriverMemory().contains(request.getSparkDriverMemory());
             }
 
             if (!StringUtils.isBlank(request.getSparkExecutorMemory()) && flag) {
-                flag = request.getSparkExecutorMemory().contains(dataDevelopNodeInfo.getSparkExecutorMemory());
+                flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkExecutorMemory()) &&
+                        dataDevelopNodeInfo.getSparkExecutorMemory().contains(request.getSparkExecutorMemory());
             }
 
             if (!StringUtils.isBlank(request.getSparkExecutorCore()) && flag) {
-                flag = request.getSparkExecutorCore().contains(dataDevelopNodeInfo.getSparkExecutorCore());
+                flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkExecutorCore()) &&
+                        dataDevelopNodeInfo.getSparkExecutorCore().contains(request.getSparkExecutorCore());
             }
 
             if (!StringUtils.isBlank(request.getSparkConf()) && flag) {
-                flag = request.getSparkConf().contains(dataDevelopNodeInfo.getSparkConf());
+                flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkConf())
+                        && dataDevelopNodeInfo.getSparkConf().contains(request.getSparkConf());
             }
 
             if (!StringUtils.isBlank(request.getSparkExecutorInstances()) && flag) {
-                flag = request.getSparkExecutorInstances().contains(dataDevelopNodeInfo.getSparkExecutorInstances());
+                flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkExecutorInstances()) &&
+                        dataDevelopNodeInfo.getSparkExecutorInstances().contains(request.getSparkExecutorInstances());
             }
 
             // 新增 executeCluster 筛选

Original file line number	Diff line number	Diff line change
`@@ -1850,23 +1850,28 @@ public List<DataDevelopNodeInfo> dataDevelopNodeResultFilter(DataDevelopNodeRequ`
`1850`	`1850`
`1851`	`1851`	`// 新增 Spark 相关属性筛选`
`1852`	`1852`	`if (!StringUtils.isBlank(request.getSparkDriverMemory()) && flag) {`
`1853`		`- flag = request.getSparkDriverMemory().contains(dataDevelopNodeInfo.getSparkDriverMemory());`
	`1853`	`+ flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkDriverMemory())`
	`1854`	`+ && dataDevelopNodeInfo.getSparkDriverMemory().contains(request.getSparkDriverMemory());`
`1854`	`1855`	`}`
`1855`	`1856`
`1856`	`1857`	`if (!StringUtils.isBlank(request.getSparkExecutorMemory()) && flag) {`
`1857`		`- flag = request.getSparkExecutorMemory().contains(dataDevelopNodeInfo.getSparkExecutorMemory());`
	`1858`	`+ flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkExecutorMemory()) &&`
	`1859`	`+ dataDevelopNodeInfo.getSparkExecutorMemory().contains(request.getSparkExecutorMemory());`
`1858`	`1860`	`}`
`1859`	`1861`
`1860`	`1862`	`if (!StringUtils.isBlank(request.getSparkExecutorCore()) && flag) {`
`1861`		`- flag = request.getSparkExecutorCore().contains(dataDevelopNodeInfo.getSparkExecutorCore());`
	`1863`	`+ flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkExecutorCore()) &&`
	`1864`	`+ dataDevelopNodeInfo.getSparkExecutorCore().contains(request.getSparkExecutorCore());`
`1862`	`1865`	`}`
`1863`	`1866`
`1864`	`1867`	`if (!StringUtils.isBlank(request.getSparkConf()) && flag) {`
`1865`		`- flag = request.getSparkConf().contains(dataDevelopNodeInfo.getSparkConf());`
	`1868`	`+ flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkConf())`
	`1869`	`+ && dataDevelopNodeInfo.getSparkConf().contains(request.getSparkConf());`
`1866`	`1870`	`}`
`1867`	`1871`
`1868`	`1872`	`if (!StringUtils.isBlank(request.getSparkExecutorInstances()) && flag) {`
`1869`		`- flag = request.getSparkExecutorInstances().contains(dataDevelopNodeInfo.getSparkExecutorInstances());`
	`1873`	`+ flag = StringUtils.isNotEmpty(dataDevelopNodeInfo.getSparkExecutorInstances()) &&`
	`1874`	`+ dataDevelopNodeInfo.getSparkExecutorInstances().contains(request.getSparkExecutorInstances());`
`1870`	`1875`	`}`
`1871`	`1876`
`1872`	`1877`	`// 新增 executeCluster 筛选`