diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java index 6a02c4446..641be2605 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java @@ -70,6 +70,8 @@ public class RelCodeBatchController extends BaseController { @GetMapping("/udiwms/relCode/batch/filter") public BaseResponse list(RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) { + String customerId = getCustomerId(); + relCodeBatchRequest.setErpId(customerId); List relCodeBatchResponses = relCodeBatchService.filterList(relCodeBatchRequest); PageInfo pageInfo = new PageInfo<>(relCodeBatchResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java b/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java index 8155bbf08..3881a799e 100644 --- a/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java +++ b/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java @@ -83,4 +83,6 @@ public class RelCodeBatchRequest extends ListPageRequest { private String code; private String startDate; private String endDate; + + private String erpId; } diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml index 63bd3eb07..a7a7bfb57 100644 --- a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml @@ -52,6 +52,9 @@ AND a.batchNo = #{batchNo} + + AND a.erpId = #{erpId} + and ( a.productCode LIKE concat('%', #{keyWords}, '%')