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 d88aac2b..db7b5279 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java @@ -74,6 +74,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 46eee559..ef9da42d 100644 --- a/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java +++ b/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java @@ -92,4 +92,6 @@ public class RelCodeBatchRequest extends ListPageRequest { @TableField(value = "parentCode") @ApiModelProperty(value = "") private String parentCode; + + private String erpId; } diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml index ac74ea13..b750ea30 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}, '%')