From 6cc39f0e6a2b83c2731526d6f4ec3b4ee1f2e807 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 9 Aug 2023 09:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/SupCertController.java           |  7 ++++---
 .../purchase/SupProductController.java        | 19 +++++++++++++++++++
 .../mybatis/mapper/purchase/SupCertDao.xml    |  1 +
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
index da4b8b5..860301a 100644
--- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
@@ -99,9 +99,10 @@ public class SupCertController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        if (certRequest.getCompanyIdFk() == null) {
-            return ResultVOUtils.error(500, "企业ID不能为空");
-        }
+//        if (certRequest.getCompanyIdFk() == null) {
+//            return ResultVOUtils.error(500, "企业ID不能为空");
+//        }
+        certRequest.setCompanyIdFk(null);
         certRequest.setType(4);
         List<SupCertEntity> supCertEntities = supCertService.selectBybId(certRequest);
         PageInfo<SupCertEntity> pageInfo;
diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java
index 9d57e3c..1b60d85 100644
--- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java
@@ -569,4 +569,23 @@ public class SupProductController {
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin.getCustomerId() + "";
     }
+
+
+    @GetMapping("/sup/product/app/cert/search")
+    public BaseResponse getProductCert(FilterPoductRequest filterPoductRequest) {
+        List<SupProductResponse> companyEntities = supProductService.getRegistration(filterPoductRequest);
+
+        if (CollUtil.isEmpty(companyEntities))
+            return ResultVOUtils.error(500, "未查询到该产品资质信息");
+        SupProductResponse supProductResponse = companyEntities.get(0);
+        FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
+        filterSupCertRequest.setProductIdFk(supProductResponse.getProductId());
+        List<SupCertEntity> supCertEntities = supCertService.selectCompanyCert(filterSupCertRequest);
+        PageInfo<SupCertEntity> pageInfo = new PageInfo<SupCertEntity>(supCertEntities);
+        PageSimpleResponse<SupCertEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(supCertEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 }
diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml
index 526a972..2b71538 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml
@@ -126,6 +126,7 @@
             </if>
             <if test="manufacturerIdFk != null and manufacturerIdFk != ''">
                 and manufacturerIdFk = #{manufacturerIdFk}
+                and (productIdFk is null or productIdFk ='')
             </if>
             <if test="productIdFk != null and productIdFk != ''">
                 and productIdFk = #{productIdFk}