diff --git a/.idea/MarsCodeWorkspaceAppSettings.xml b/.idea/MarsCodeWorkspaceAppSettings.xml
index 589189f3..68fda07e 100644
--- a/.idea/MarsCodeWorkspaceAppSettings.xml
+++ b/.idea/MarsCodeWorkspaceAppSettings.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
index 825406af..892555e8 100644
--- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
@@ -2,7 +2,6 @@ package com.sdm.project.service.impl;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sdm.common.common.ResultCode;
@@ -71,7 +70,6 @@ import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
@@ -1294,7 +1292,13 @@ public class NodeServiceImpl extends ServiceImpl allWorkspaces = getWorkspaceListOrThrow(req.getNodeUuid());
+ SdmResponse> response = getWorkspaceList(req.getNodeUuid());
+ if (!response.isSuccess() || ObjectUtils.isEmpty(response.getData())) {
+ log.error("[getDedicatedTime] 未查询到项目工位信息 ");
+ return SdmResponse.success(new ArrayList<>());
+ }
+ List allWorkspaces = response.getData();
+
PageSlice pageSlice = sliceWorkspaces(allWorkspaces, req.getCurrent(), req.getSize());
// 批量查询当前页工位的扩展属性
@@ -1333,18 +1337,12 @@ public class NodeServiceImpl extends ServiceImpl getWorkspaceListOrThrow(String nodeUuid) {
- SdmResponse> response = getChildrenNodeList(
+ private SdmResponse> getWorkspaceList(String nodeUuid) {
+
+ return getChildrenNodeList(
Collections.singletonList(nodeUuid),
NodeTypeEnum.WORKSPACE.getValue()
);
-
- if (!response.isSuccess() || ObjectUtils.isEmpty(response.getData())) {
- log.error("[getDedicatedTime] 未查询到项目工位信息 projectUuid={}", nodeUuid);
- throw new IllegalStateException("未查询到项目工位信息");
- }
-
- return response.getData();
}
/**