1.修复bug

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("添加成功");
     }

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[<>]]> ''