From 6de11904c373ded1f44f326382bb59d08b24c8d1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 11:55:22 +0800
Subject: [PATCH] 增加分工表导入功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 6 ++----
1 files changed, 2 insertions(+), 4 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..e0eb14f 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,11 +73,10 @@
List<NcNodeVO> list = ncNodeService.lazyList(parentId);
if(list != null && !list.isEmpty()) {
for(NcNodeVO ncNodeVO : list) {
- if(!"60".equals(ncNodeVO.getNodeType())){
+ if(!NcNode.TYPE_PROGRAM_PACKAGE.equals(ncNodeVO.getNodeType())){
break;
}
ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
-
}
}
@@ -131,10 +130,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