From 4b50090b0b8fee6687aafc7f1fad49daf63ef42a Mon Sep 17 00:00:00 2001
From: admin <admin@CHENQINGFENG>
Date: Fri, 31 Mar 2023 07:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/idc/service/impl/IdcServiceImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
index 795fe2f6c..28d6916fd 100644
--- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
+++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
@@ -78,7 +78,7 @@ public class IdcServiceImpl implements IdcService {
 			"basicThirdProducts//thr_products/code,thirdSysFk///updateTime///第三方产品信息","//sup_cert////updateTime/filePath//资质证书信息",
 			"//sup_cert_set////updateTime///供应商资质证书设置","companyCert//sup_company////updateTime///配送企业",
 			"manufacturerCert//sup_manufacturer////updateTime///生产企业","productCert//sup_product/productId,manufacturerIdFk,customerId///updateTime///产品资质信息",
-			"dbDiProducts//productinfo/nameCode,uuiddiType///updateTime///DI产品信息//udicompany/tyshxydm///updateTime///国际库医疗器械注册人信息"};
+			"dbDiProducts//productinfo/nameCode,uuid,diType///updateTime///DI产品信息//udicompany/tyshxydm///updateTime///国际库医疗器械注册人信息"};
 	
 	private int orderNum=0;
 
@@ -102,6 +102,7 @@ public class IdcServiceImpl implements IdcService {
 		return ResultVOUtils.success(list);
 	}
 
+	
 	@Override
 	public	BaseResponse download(HttpServletRequest request,Map<String,Object> params) {
 		Map<String,Object> map = dbDao.get("select * from basic_upload_status where taskId='"+params.get("taskId")+"'");
@@ -563,7 +564,7 @@ public class IdcServiceImpl implements IdcService {
 			String extra = columnList.get(i).get("extra")!=null&&columnList.get(i).get("extra").toLowerCase().contains("auto_i") ? "A" : "N";
 			sql+=extra.equals("N") ? columnList.get(i).get("columnName").toString() : "";
 			col+=extra.equals("N") ? 1 : 0;
-			if(uniqueColumn!=null&&columnList.get(i).get("columnKey")!=null&&(","+uniqueColumn+",").contains(","+columnList.get(i).get("columnKey")+",")) {
+			if(uniqueColumn!=null&&columnList.get(i).get("columnKey")!=null&&(","+uniqueColumn+",").contains(","+columnList.get(i).get("columnName")+",")) {
 				keyColumn[key] = columnList.get(i).get("columnName").toString();
 				keyDataType[key]=columnList.get(i).get("dataType").toString().contains("char") ? "C" : columnList.get(i).get("dataType").toString().contains("date") ? "D" : "N";
 				key++;