fix(tcm/jg):tcm bug23318修改，jg西安上传设备的datasource修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/XiAnDataDockServiceImpl.java

@@ -122,7 +122,7 @@ public class XiAnDataDockServiceImpl {
         if (!ValidationUtil.isEmpty(useInfo)) {
             useInfo.setRecDate(new Date());
             useInfo.setRecord(record);
-            useInfo.setDataSource("jg_his_xx");
+            useInfo.setDataSource("jg_his_xa");
             useInfo.setIsNotEs("1");
             useInfo.setIsIntoManagement(Boolean.FALSE);
             useInfo.setUseUnitCreditCode(String.valueOf(equ.get("useUnitCode")).trim());

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -656,7 +656,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 			tzBaseEnterpriseInfo.setDistrict(addressList.get(2));
 			tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
 			tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("street")) ? null : String.valueOf(map.get("street")));
-			tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("regAddress")) ? null : String.valueOf(map.get("regAddress")));
+//			tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("regAddress")) ? null : String.valueOf(map.get("regAddress")));
 			tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
 			regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
 			DataDictionary regOrganCodeDict = iDataDictionaryService.getByCode(String.valueOf(map.get("registeredOrganCode")),"DJJG");
@@ -682,9 +682,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 		// 企业信息变更-同步修改企业下人员绑定设备类型
 		ArrayList<String> newData = new ArrayList<>();
 		JSONArray objects = JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory());
-		objects.forEach(item ->{
-			newData.add(item.toString());
-		});
+		objects.forEach(item -> newData.add(item.toString()));
         boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
         if (b) {
 			try {