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 supCertEntities = supCertService.selectBybId(certRequest); PageInfo 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 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 supCertEntities = supCertService.selectCompanyCert(filterSupCertRequest); + PageInfo pageInfo = new PageInfo(supCertEntities); + PageSimpleResponse 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 @@ and manufacturerIdFk = #{manufacturerIdFk} + and (productIdFk is null or productIdFk ='') and productIdFk = #{productIdFk}