From 012235d05d8dc7c2decdc7229d93033b0399ecbb Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期日, 10 十一月 2024 15:49:53 +0800
Subject: [PATCH] 集成获取mdm分发通用数据格式接口集成

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.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/CodeMdmInfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java
index 5701c22..14c5bc0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java
@@ -1,6 +1,7 @@
 package com.vci.ubcs.code.service.impl;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -28,6 +29,7 @@
 import com.vci.ubcs.code.vo.webserviceModel.mdm.MDMParamData;
 import com.vci.ubcs.code.vo.webserviceModel.mdm.MdmResultData;
 import com.vci.ubcs.code.vo.webserviceModel.person.EnumerableData;
+import com.vci.ubcs.code.vo.webserviceModel.person.PersonMasterData;
 import com.vci.ubcs.code.vo.webserviceModel.person.ResultMdMapping;
 import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
 import com.vci.ubcs.code.webService.config.AttributeMapConfig;
@@ -183,6 +185,10 @@
 				throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
 			}
 			List<ClassifyConfig> classifyConfigList=mdmInterFaceConfig.getClassifyconfigs();
+			//masterDataList
+			String masterDataStr = mdmParamData.getMasterData();
+			masterDataList = JSONArray.parseObject(masterDataStr,List.class);
+
 			if(StringUtils.isNotBlank(library)&&StringUtils.isNotBlank(classifyCode)){
 				String finalLibrary = library;
 				classifyConfigList.stream().forEach(classifyConfig -> {
@@ -264,7 +270,7 @@
 			if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
 				throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
 			}
-			masterDataList = mdmParamData.getMasterData();
+
 			List<String> codeList = new ArrayList<>();
 			List<ApplyDataVO> applyDataVOList = new ArrayList<>();
 			List<ApplyDataVO> deleteDataVOList = new ArrayList<>();

--
Gitblit v1.9.3