From f4c6e0e1308bccb943ca1cddfdf7f643b6b6a1aa Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 15 七月 2025 23:39:30 +0800
Subject: [PATCH] 测试导出dnc

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index 17e2b18..a692911 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -130,6 +130,7 @@
 			recObj.put("code", program.getCode());
 			recObj.put("ossName",program.getOssName());
 			recObj.put("isTextFile",program.getIsTextFile());
+			recObj.put("isLastEdition",program.getIsLastEdition());
 			recObj.put("category",program.getCategory());
 			recObj.put("description",program.getDescription());
 			recObj.put("name",program.getName());
@@ -196,11 +197,11 @@
 
 		ArrayList<Long> exportNodeIdList 	= new ArrayList<>();
 		for(NcProgram program : programs){
-			JSONObject recObj = new JSONObject();
-			if(!exportNodeIdList.contains(program.getNcNodeId())){
-				exportNodeIdList.add(program.getNcNodeId());
+			//JSONObject recObj = new JSONObject();
+			if(!exportNodeIdList.contains(program.getBindNcNodeId())){
+				exportNodeIdList.add(program.getBindNcNodeId());
 			}
-			NcNode ncNode = ncNodeService.getById(program.getNcNodeId());
+			NcNode ncNode = ncNodeService.getById(program.getBindNcNodeId());//浠庣粦瀹氱殑鑺傜偣鏈韩寮�濮嬪鍑�
 
 			if(StringUtils.isNotEmpty(ncNode.getParentIds())){
 				List<Long> pids = Func.toLongList(ncNode.getParentIds());

--
Gitblit v1.9.3