Merge remote-tracking branch 'origin/master'

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()) {

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);

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;
     }
 

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