From a1b9309508e352a42aa1df02473f579675f69fa4 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 3 Aug 2022 08:33:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/controller/basic/UdiContrastController.java | 8 +++++++-
 .../resources/mybatis/mapper/basic/UdiRelevanceDao.xml    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java
index 22117da3..c40c15f1 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java
@@ -90,14 +90,20 @@ public class UdiContrastController {
                 }
             }
         } else if (CollUtil.isNotEmpty(combineRequest.getThirdIds())) {
+            StringBuffer buffer = new StringBuffer();
             //只添加产品
             for (String thirdId : combineRequest.getThirdIds()) {
                 if (udiContrastService.isExit(null, thirdId)) {
-                    return ResultVOUtils.error(500, "产品编码:" + thirdId + "已存在!");
+                    buffer.append(thirdId).append(",");
                 } else {
                     createOnlyMainId(combineRequest, thirdId);
                 }
             }
+
+            if (StrUtil.isNotBlank(buffer.toString())) {
+                String errorInfo = StrUtil.removeSuffix(buffer.toString(), ",");
+                return ResultVOUtils.error(500, "产品编码:" + errorInfo + "已存在!");
+            }
         }
         return ResultVOUtils.success("添加成功");
     }
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 6a49d5da..49228d88 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -263,7 +263,7 @@
                 AND basic_products.originUuid is NULL
             </if>
             <if test="filterType != null and filterType == 3">
-                AND mainId is NULL and basic_products.originUuid <![CDATA[<>]]> ''
+                AND (mainId is NULL or mainId = '') and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 4">
                 AND thirdId1 is NULL and basic_products.originUuid <![CDATA[<>]]> ''