From edeb5a87011c8aa1960951872a6555b4470ef947 Mon Sep 17 00:00:00 2001
From: zhengmingliang <hongtianzai@126.com>
Date: Wed, 16 Nov 2022 10:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/admin/controller/purechase/SupProductController.java   | 2 +-
 .../main/resources/mybatis/mapper/purchase/SupCertSetDao.xml    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java
index fa3cc89..35a4542 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java
@@ -118,7 +118,7 @@ public class SupProductController {
             ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
             while (iterable.hasNext()) {
                 SupCertSetEntity supCertSetEntity = iterable.next();
-                if (supCertSetEntity.getImports() == 1|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
+                if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
                         && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
                         || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
                         || (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()))
diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml
index 4c69151..0cc54f8 100644
--- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml
@@ -16,7 +16,6 @@
             <if test="need!=null">
                 and `need` = #{need}
             </if>
-            AND `foreign` is not null
         </where>
         ORDER BY id DESC
     </select>