From c1d02f9b9f0eefd3335d32acb2929dd584b581f3 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 11 Apr 2023 16:58:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=AE=A1=E6=A0=B8=E5=88=86=E9=85=8D=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java       | 2 ++
 .../glxp/api/service/auth/impl/AuthRoleServiceImpl.java    | 2 +-
 src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml     | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java b/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java
index dd0ec29c..48b5bd1a 100644
--- a/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java
+++ b/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java
@@ -24,6 +24,8 @@ public interface AuthRoleDao {
 
     List<AuthRole> listCustomerRoles(@Param("isCustomer") Integer isCustomer);
 
+    List<AuthRole> getCustomerRoles(@Param("isCustomer") Integer isCustomer);
+
     List<AuthRole> listAuthRoles2();
 
     AuthRole findByName(String name);
diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java
index 251b0fb4..8b5f8411 100644
--- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java
@@ -99,7 +99,7 @@ public class AuthRoleServiceImpl implements AuthRoleService {
         limit = limit != null && limit > 0 && limit < 100 ? limit : 100;
         int offset = (page - 1) * limit;
         PageHelper.offsetPage(offset, limit);
-        List<AuthRole> list = authRoleDao.listCustomerRoles(isCustomer);
+        List<AuthRole> list = authRoleDao.getCustomerRoles(isCustomer);
         return list;
     }
 
diff --git a/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml b/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml
index f1fe3f55..e4231c56 100644
--- a/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml
@@ -44,6 +44,13 @@
         where `isCustomer` = #{isCustomer}
     </select>
 
+    <select id="getCustomerRoles" parameterType="java.lang.Integer"
+            resultType="com.glxp.api.entity.auth.AuthRole">
+        SELECT role_id, role_name
+        FROM auth_role
+        where `isCustomer` = #{isCustomer}  and status =1
+    </select>
+
 
     <select id="listAuthRoles2" parameterType="java.lang.Integer" resultType="com.glxp.api.entity.auth.AuthRole">
         SELECT irole_id, role_name

From 78f73e4832914836292e512425e0b2905743c22e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 11 Apr 2023 17:30:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=88=E5=9B=9E=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E8=B4=A8=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E4=B8=80=E6=A0=B7?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/purchase/SupCertController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 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 b0b15a85..d46c129a 100644
--- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
@@ -100,7 +100,7 @@ public class SupCertController {
         if (postSelCertRequest.getCertType() == null) {
             return ResultVOUtils.error(500, "参数错误！");
         }
-
+        if (postSelCertRequest.getManufacturerIdFk() == null) {
             String errMsg = "";
             ArrayList<String> list = new ArrayList<>();
             int i = postSelCertRequest.getSupCertSetEntities().size();
@@ -120,7 +120,7 @@ public class SupCertController {
                     }
                 }
             }
-
+        }
 
 
         for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) {