From 27cddefb0cb28da699954ba1a1756d6bcabafbbe Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期三, 05 三月 2025 17:41:29 +0800 Subject: [PATCH] 集成申码接口调整:当码值按照约定传表名为空的业务场景下传null校验问题和码值组装问题。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 7b1185c..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) { - code = sysDataObject.getAttributeValue("GROUPCODE"); + /*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