From 5f0d9a00a1e0f27c2f8396dcd98fac5022aa40c7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 13 四月 2024 20:48:04 +0800
Subject: [PATCH] 内网开发环境代码合并

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java                     |   52 ++++++------
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java                           |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java                       |    1 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java         |    6 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java                  |    2 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java      |  115 ++++++++++++++--------------
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java |    5 
 7 files changed, 89 insertions(+), 93 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
index 731cb06..2b61960 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
@@ -55,7 +55,7 @@
 	/***
 	 * 鎺掑簭鍙�
 	 */
-	private  String sort_order;
+	private String sort_order;
 
 	/**
 	 *鍚敤鐘舵�� 1=鏈惎鐢紝2=宸插惎鐢紝3e宸插仠鐢�
@@ -75,7 +75,7 @@
 	/***
 	 * 閮ㄩ棬鐘舵��,鏈夋晥銆佷綔搴�
 	 */
-	private  String department_status;
+	private String department_status;
 
 	/***
 	 * 閮ㄩ棬鏄剧ず鐘舵��,鏄剧ず銆佷笉鏄剧ず
@@ -488,7 +488,7 @@
 			", mdm_datastatus='" + mdm_datastatus + '\'' +
 			", mdm_cleanstatus='" + mdm_cleanstatus + '\'' +
 			", link_fieldvalue='" + link_fieldvalue + '\'' +
-			", floy_middatastatus='" + flow_middatastatus + '\'' +
+			", flow_middatastatus='" + flow_middatastatus + '\'' +
 			", original_code='" + original_code + '\'' +
 			", pk_mdm='" + pk_mdm + '\'' +
 			", mdm_duplicate='" + mdm_duplicate + '\'' +
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
index e021e1f..16381da 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
@@ -1,6 +1,7 @@
 package com.vci.ubcs.code.vo.webserviceModel.person;
 
 public class PersonMasterData {
+
 	/***
 	 * 鏁版嵁鍦ㄦ绯荤粺涓敮涓�鏍囪瘑
 	 */
@@ -54,7 +55,7 @@
 	/***
 	 * 绫嶈疮
 	 */
-	private String citiizenship;
+	private String citizenship;
 
 	/**
 	 * 鍥藉/鍦板尯
@@ -112,7 +113,7 @@
 	private String mobile_phone;
 
 	/***
-	 * 鍚嶆棌
+	 * 姘戞棌
 	 */
 	private String nationality;
 
@@ -156,7 +157,7 @@
 	 */
 	private String worker_category;
 
-	/***
+	/**
 	 * 浜哄憳绫诲埆缂栫爜
 	 */
 	private String worker_category_code;
@@ -197,7 +198,7 @@
 	private String business_level_code;
 
 	/**
-	 * 鍟嗗瘑绛夌骇缂栫爜
+	 * 鍟嗗瘑绛夌骇鍚嶇О
 	 */
 	private String business_level_name;
 
@@ -348,12 +349,36 @@
 		this.birthplace = birthplace;
 	}
 
-	public String getCitiizenship() {
-		return citiizenship;
+	public String getCitizenship() {
+		return citizenship;
 	}
 
-	public void setCitiizenship(String citiizenship) {
-		this.citiizenship = citiizenship;
+	public void setCitizenship(String citizenship) {
+		this.citizenship = citizenship;
+	}
+
+	public String getWorker_category_code() {
+		return worker_category_code;
+	}
+
+	public String getWorker_level_code() {
+		return worker_level_code;
+	}
+
+	public String getCountry_level_code() {
+		return country_level_code;
+	}
+
+	public String getCountry_level_name() {
+		return country_level_name;
+	}
+
+	public String getBusiness_level_code() {
+		return business_level_code;
+	}
+
+	public String getBusiness_level_name() {
+		return business_level_name;
 	}
 
 	public String getCountry() {
@@ -362,6 +387,30 @@
 
 	public void setCountry(String country) {
 		this.country = country;
+	}
+
+	public void setWorker_category_code(String worker_category_code) {
+		this.worker_category_code = worker_category_code;
+	}
+
+	public void setWorker_level_code(String worker_level_code) {
+		this.worker_level_code = worker_level_code;
+	}
+
+	public void setCountry_level_code(String country_level_code) {
+		this.country_level_code = country_level_code;
+	}
+
+	public void setCountry_level_name(String country_level_name) {
+		this.country_level_name = country_level_name;
+	}
+
+	public void setBusiness_level_code(String business_level_code) {
+		this.business_level_code = business_level_code;
+	}
+
+	public void setBusiness_level_name(String business_level_name) {
+		this.business_level_name = business_level_name;
 	}
 
 	public String getDept_type() {
@@ -534,54 +583,6 @@
 
 	public String getWorker_level() {
 		return worker_level;
-	}
-
-	public String getWorker_category_code() {
-		return worker_category_code;
-	}
-
-	public String getWorker_level_code() {
-		return worker_level_code;
-	}
-
-	public String getCountry_level_code() {
-		return country_level_code;
-	}
-
-	public String getCountry_level_name() {
-		return country_level_name;
-	}
-
-	public String getBusiness_level_code() {
-		return business_level_code;
-	}
-
-	public String getBusiness_level_name() {
-		return business_level_name;
-	}
-
-	public void setWorker_category_code(String worker_category_code) {
-		this.worker_category_code = worker_category_code;
-	}
-
-	public void setWorker_level_code(String worker_level_code) {
-		this.worker_level_code = worker_level_code;
-	}
-
-	public void setCountry_level_code(String country_level_code) {
-		this.country_level_code = country_level_code;
-	}
-
-	public void setCountry_level_name(String country_level_name) {
-		this.country_level_name = country_level_name;
-	}
-
-	public void setBusiness_level_code(String business_level_code) {
-		this.business_level_code = business_level_code;
-	}
-
-	public void setBusiness_level_name(String business_level_name) {
-		this.business_level_name = business_level_name;
 	}
 
 	public void setWorker_level(String worker_level) {
@@ -785,7 +786,7 @@
 			", admin_division_code='" + admin_division_code + '\'' +
 			", birthday='" + birthday + '\'' +
 			", birthplace='" + birthplace + '\'' +
-			", citiizenship='" + citiizenship + '\'' +
+			", citizenship='" + citizenship + '\'' +
 			", country='" + country + '\'' +
 			", dept_type='" + dept_type + '\'' +
 			", dept_name='" + dept_name + '\'' +
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
index 7ba6101..bc5298e 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -28,7 +28,6 @@
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -136,7 +135,6 @@
 		log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� start");
 		try {
 			Map<String,List<BaseModel>> editObjectMap = new HashMap<>();
-
 			List<DockingPreApplyForm> dockingPreApplyFormList = new ArrayList();
 			//String classId = javaObject.getClassId();
 			//String sysName = javaObject.getSysName();
@@ -173,6 +171,7 @@
 				} else if ("9".equals(formState)) {
 					msg = "瀹℃牳涓�";
 				}
+				// 濡傛灉杩斿洖浜嗗鏌ユ剰瑙佸氨鐢ㄨ繑鍥炵殑
 				msg = Func.isNotBlank(mainData.getExamineOpinion()) ? msg+"锛屾剰瑙侊細"+mainData.getExamineOpinion():msg;
 				jcontent.put("applyId", applyId);
 				jcontent.put("formState", formState);
@@ -225,7 +224,7 @@
 			if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
 				dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
 			}
-			saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",false,JSON.toJSONString(dockingReturnStoreVO.getMainData()));
+			saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",false, JSON.toJSONString(dockingReturnStoreVO.getMainData()));
 		}catch (Throwable e){
 			e.printStackTrace();
 			saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",true,"閿欒淇℃伅锛�"+e.getMessage()+"\n"+ JSON.toJSONString(dockingReturnStoreVO.getMainData()));
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 5eb6253..614bb51 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -146,7 +146,6 @@
 	 * 绯诲垪娴佹按
 	 */
 	@Value("${bzApply.seriesFlow:seriesFlow}")
-
 	private String seriesFlow;
 
 	/***
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 eb21267..4345114 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
@@ -68,7 +68,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.bind.ValidationEvent;
 import java.beans.BeanInfo;
 import java.beans.Introspector;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 9a6311d..14524ab 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -360,7 +360,7 @@
 			List<CodeBasicSecVO> attrSecVOList = new ArrayList<>();
 			for (int i = 0; i < secVOList.size(); i++) {
 				CodeBasicSecVO secVO = secVOList.get(i);
-				try {
+				try{
 					switchSecValue(secVO, secValueMap, classifyFullInfoBO, serialSecVOList, attrSecVOList, serialUnitList, secValueList);
 				}catch (Exception e){
 					throw new ServiceException("鐮佸�艰浆鎹㈡椂鍑虹幇閿欒锛屽師鍥狅細"+e.getMessage());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index ca3d624..d32d2af 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -69,8 +69,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.ws.WebServiceContext;
 import javax.xml.ws.handler.MessageContext;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ForkJoinPool;
@@ -308,7 +306,7 @@
 			//List<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new ArrayList<>();
 			String finalSystemId = systemId;
 			classVOList.stream().forEach(classVO -> {
-				log.info("鍙傛暟锛氬垎绫籆Ode:" + classVO.getClassCode());
+				log.info("鍙傛暟锛氬垎绫籆ode:" + classVO.getClassCode());
 				boolean isCodeOrGroupCode=false;
 				LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
 				String libray ="";
@@ -490,7 +488,7 @@
 				ClassfyVO classfyVO = new ClassfyVO();
 				classfyVO.setLibrary(personLibrary);
 				classfyVO.setClassCode(personClassCode);
-				CodeClassifyVO  codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
+				CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
 				log.info("end锛氬垎绫绘煡璇㈠畬姣�");
 				//鑾峰彇鍒嗙被妯℃澘淇℃伅
 				if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -508,8 +506,7 @@
 				).collect(Collectors.toList());
 
 				List<PersonMasterData> personMasterDataList= personData.getMasterData();
-				List<Map> dataList=new ArrayList<>();
-
+				//List<Map> dataList=new ArrayList<>();
 				List<String> codeList=new ArrayList<>();
 
 				List<ApplyDataVO> applyDataVOList=new ArrayList<>();
@@ -528,7 +525,7 @@
 					 */
 					fields.stream().forEach(field->{
 						if(dataMap.containsKey(field)){
-							String enumFiled= dataMap.get(field);
+							String enumFiled = dataMap.get(field);
 							EnumerableData enumerableData=JSONObject.toJavaObject(JSONObject.parseObject(enumFiled),EnumerableData.class);
 							String enumCode=enumerableData.getCode();
 							//String enumCodeValue=enumerableData.getName();
@@ -548,11 +545,11 @@
 
 					object.setProp(proppertyVOList);
 					if(personMasterData.getDr()==1){
-						object.setOperate("delete");//鎿嶄綔绫诲瀷
+						//鎿嶄綔绫诲瀷
+						object.setOperate("delete");
 						deleteDataVOList.add(object);
 					}else{
-						String worker_category=personMasterData.getWorker_category();
-
+						//String worker_category=personMasterData.getWorker_category();
 						object.setOperate("create");
 						applyDataVOList.add(object);
 					}
@@ -580,7 +577,7 @@
 				sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
 				sb.append(")");
 				List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
-
+				DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
 				List<ClientBusinessObject> cboList=	ChangeMapTOClientBusinessObjects(dataMapList);
 				ApplyDatasVO applyDatasVO=new ApplyDatasVO();
 				ApplyDatasVO editDatasVO=new ApplyDatasVO();
@@ -724,7 +721,7 @@
 				resultOrgData.setMessage(message);
 				resultOrgData.setSuccess(success.get());
 				resultOrgData.setMdMappings(resultMdMappingList);
-				Object object = JSONObject.toJSON(resultOrgData);
+				//Object object = JSONObject.toJSON(resultOrgData);
 			}
 			String resultStr = JSONObject.toJSONString(resultOrgData);
 			String data = JSONObject.toJSONString(personData);
@@ -749,13 +746,13 @@
 	public ResultOrgData syncDataForOrg(OrgData orgData) {
 		boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
 		ResultOrgData resultOrgData=new ResultOrgData();
-		//boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
+		// boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
 		List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
 		AtomicBoolean success= new AtomicBoolean(true);
 		String message="";
 		String systemCode="";
 		if(isUsedFlag){
-			List<OrgMasterData> orgMasterDataList=new ArrayList<>();
+			List<OrgMasterData> orgMasterDataList = new ArrayList<>();
 			List<String> fields = Func.toStrList(personAndDeptConfig.getDeptFields());
 			try {
 				if(orgData==null){
@@ -778,7 +775,7 @@
 				ClassfyVO classfyVO = new ClassfyVO();
 				classfyVO.setLibrary(deptLibrary);
 				classfyVO.setClassCode(deptClassCode);
-				CodeClassifyVO  codeClassifyVO=this.getClassfy(classfyVO,deptLibrary);
+				CodeClassifyVO codeClassifyVO = this.getClassfy(classfyVO,deptLibrary);
 				log.info("end锛氬垎绫绘煡璇㈠畬姣�");
 				//鑾峰彇鍒嗙被妯℃澘淇℃伅
 				if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -802,10 +799,10 @@
 					object.setCode(orgMasterData.getMdm_code());//缂栫爜
 					object.setCreator(orgMasterData.getCreator());//鍒涘缓鑰�
 					object.setEditor(orgMasterData.getModifier());//淇敼鑰�
-					object.setId(orgMasterData.getPk_mdm());//涓婚敭
+					object.setId(orgMasterData.getDepartment_code());//涓婚敭
 					object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂�
 					Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
-					List<ProppertyVO> proppertyVOList=new ArrayList<>();
+					List<ProppertyVO> proppertyVOList = new ArrayList<>();
 					/***
 					 * 鏍规嵁閰嶇疆鏂囦欢鑾峰彇鏋氫妇鍊�
 					 */
@@ -834,7 +831,6 @@
 						object.setOperate("delete");//鎿嶄綔绫诲瀷
 						deleteDataVOList.add(object);
 					}else{
-
 						object.setOperate("create");
 						applyDataVOList.add(object);
 					}
@@ -850,10 +846,10 @@
 					throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
 				}
 				String tableName = btmTypeVO.getTableName();
-				if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
+				if (StringUtils.isBlank(tableName)) {
 					throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
 				}
-				StringBuffer sb=new StringBuffer();
+				StringBuffer sb = new StringBuffer();
 				sb.append(" select * from ");
 				sb.append(tableName);
 				sb.append(" where 1=1 ");
@@ -861,15 +857,16 @@
 				sb.append(" and id in (");
 				sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
 				sb.append(")");
-				List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
-				List<ClientBusinessObject> cboList=	ChangeMapTOClientBusinessObjects(dataMapList);
+				List<Map<String,String>> dataMapList = commonsMapper.queryByOnlySqlForMap(sb.toString());
+				DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
+				List<ClientBusinessObject> cboList = ChangeMapTOClientBusinessObjects(dataMapList);
 				ApplyDatasVO applyDatasVO=new ApplyDatasVO();
 				ApplyDatasVO editDatasVO=new ApplyDatasVO();
 				if(!CollectionUtils.isEmpty(cboList)){
-					Map<String,ClientBusinessObject> oldpplyDataVOMap=	cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+					Map<String,ClientBusinessObject> oldpplyDataVOMap =	cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
 					//鏁版嵁搴撲笉瀛樺湪鐨�
 					List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
-						String code =cbo.getCode();
+						String code = cbo.getCode();
 						return !oldpplyDataVOMap.containsKey(code);
 					}).collect(Collectors.toList());
 					applyDatasVO.setObject(applyApplyDataVOList);
@@ -892,7 +889,7 @@
 					DataObjectVO dataObjectVO = new DataObjectVO();
 					this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
 					log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
-					boolean  personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
+					boolean personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
 					mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
 					log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
 				}
@@ -1514,7 +1511,8 @@
 					sb.append(" and lastr=1 and lastv=1" );
 					sb.append(" and codeclsfid in (" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) +")");
 					sb.append(" and Lcstatus in (" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) +")");
-					List<Map<String,String>>  newDataList= commonsMapper.queryByOnlySqlForMap(sb.toString());
+					List<Map<String,String>> newDataList = commonsMapper.queryByOnlySqlForMap(sb.toString());
+					DefaultAttrAssimtUtil.mapToLowerCase(newDataList,true);
 					List<ClientBusinessObject> clientBusinessObjects=	ChangeMapTOClientBusinessObjects(newDataList);
 					List<com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO> dataObjectVOS=new ArrayList<>();
 					if(!CollectionUtils.isEmpty(clientBusinessObjects)){
@@ -2460,7 +2458,7 @@
 	 */
 	public void getConfigDatas(String systemId,String libray, ApplyBZDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
 
-		LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
+		// LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
 		//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
 		Map<String, String> attrMapConfigMap=new HashMap<>();
 		Map<String, String> propMaps=new HashMap<>();

--
Gitblit v1.9.3