From af7e7e39012d7c9c19ae8e5ee32d3462ade21467 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Tue, 4 Jul 2023 10:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/SupManufacturerController.java       | 15 ++++++++++++++-
 .../mybatis/mapper/purchase/SupCertDao.xml        |  6 ++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java
index 5af168f..f4e4f29 100644
--- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java
@@ -116,10 +116,13 @@ public class SupManufacturerController {
 //        return ResultVOUtils.success(pageSimpleResponse);
 //    }
 
+
+
     @AuthRuleAnnotation("")
     @GetMapping("/directToCpt/sup/manufacturer/getCompanyBySup")
     public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) {
-//        filterSupManufacturerRequest.setCustomerId(getCustomerId());
+        filterSupManufacturerRequest.setCustomerId(getCompanyId());
+        System.out.println("111111111111111111111111111111111111:"+getCompanyId());
         List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
         PageInfo<SupManufacturerEntity> pageInfo = new PageInfo<>(companyEntities);
         PageSimpleResponse<SupManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
@@ -650,4 +653,14 @@ public class SupManufacturerController {
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin.getCustomerId() + "";
     }
+
+    public String getCompanyId() {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes == null) {
+            throw new JsonException(ResultEnum.NOT_NETWORK);
+        }
+        HttpServletRequest request = attributes.getRequest();
+        String companyId = request.getHeader("companyId");
+        return companyId;
+    }
 }
diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml
index 66084aa..e24ddc8 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml
@@ -5,7 +5,7 @@
 
     <select id="filterCompanyCert" parameterType="com.glxp.api.req.purchase.FilterSupCertRequest"
             resultType="com.glxp.api.entity.purchase.SupCertEntity">
-        select * from sup_cert
+        select * from user_cert
         <where>
             <if test="customerId != '' and customerId!=null">
                 and customerId = #{customerId}
@@ -31,7 +31,9 @@
             <if test="auditStatus ==25">
                 and (auditStatus !=0)
             </if>
-
+            <if test="businessId != '' and businessId!=null">
+                and businessId = #{businessId}
+            </if>
         </where>
         ORDER BY id DESC
     </select>