From 87895ab581b2f44e3492e4395dce5fc7e8341363 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 17:00:48 +0800
Subject: [PATCH] 替换注化
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 0c651c6..59730bd 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -73,13 +73,10 @@
List<NcNodeVO> list = ncNodeService.lazyList(parentId);
if(list != null && !list.isEmpty()) {
for(NcNodeVO ncNodeVO : list) {
- if(!"60".equals(ncNodeVO.getNodeType())){
- break;
+ if(NcNode.TYPE_PROGRAM_PACKAGE.equals(ncNodeVO.getNodeType())){
+ ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
}
- ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
-
}
-
}
return R.data(list);
}
@@ -131,10 +128,9 @@
NcNode node2 = ncNodeService.getById(id2);
if(node1.getFlowProgramFileId() != null) {
vo.setContent1(flowProgramFileService.getFileContent(node1.getFlowProgramFileId()));
-
}
if(node2.getFlowProgramFileId() != null) {
- vo.setContent1(flowProgramFileService.getFileContent(node2.getFlowProgramFileId()));
+ vo.setContent2(flowProgramFileService.getFileContent(node2.getFlowProgramFileId()));
}
return R.data(vo);
--
Gitblit v1.9.3