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 list = new ArrayList<>(); int i = postSelCertRequest.getSupCertSetEntities().size(); @@ -120,7 +120,7 @@ public class SupCertController { } } } - + } for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { 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 listCustomerRoles(@Param("isCustomer") Integer isCustomer); + List getCustomerRoles(@Param("isCustomer") Integer isCustomer); + List 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 list = authRoleDao.listCustomerRoles(isCustomer); + List 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} + +