From d9183aa80ae17d36b79dda48c6b1d7fa22a80ee3 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 22 一月 2025 11:20:41 +0800
Subject: [PATCH] 现场型号代号/人员/组织接口调试

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index e6798b6..364dedf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -3376,11 +3376,17 @@
 	private void getCodeOrderDTOs(CodeClassifyVO codeClassifyVO, CodeClassifyTemplateVO templateVO, Map<String, RowDatas> codeDataMap, Map<String, ClientBusinessObject> codeSystemObjectMap, List<CodeOrderDTO> codeOrderDTOList, Map<String, String> errorMap, boolean isCodeOrGroupCode) {
 		codeSystemObjectMap.keySet().forEach(code -> {
 			ClientBusinessObject sysDataObject = codeSystemObjectMap.get(code);
-			if (isCodeOrGroupCode) {
+			/*if (isCodeOrGroupCode) {
 			//	code = sysDataObject.getAttributeValue("GROUPCODE");
 				if (StringUtils.isBlank(code)) {
 					code = sysDataObject.getId();
 				}
+			}*/
+			if(isCodeOrGroupCode){
+				String groupCode=sysDataObject.getAttributeValue("GROUPCODE");
+				if(codeDataMap.containsKey(groupCode)){
+					code=groupCode;
+				}
 			}
 			CodeOrderDTO orderDTO = new CodeOrderDTO();
 			if (codeDataMap.containsKey(code)) {

--
Gitblit v1.9.3