From 25a0b9b9a4db5533e3ffda9478a5722bd3ce0685 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 7 Nov 2024 15:02:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/collect/RelCodeBatchController.java    | 2 ++
 .../java/com/glxp/api/req/collect/RelCodeBatchRequest.java     | 2 ++
 .../resources/mybatis/mapper/collect/RelCodeBatchMapper.xml    | 3 +++
 3 files changed, 7 insertions(+)

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<RelCodeBatchResponse> relCodeBatchResponses = relCodeBatchService.filterList(relCodeBatchRequest);
         PageInfo<RelCodeBatchResponse> pageInfo = new PageInfo<>(relCodeBatchResponses);
         PageSimpleResponse<RelCodeBatchResponse> 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 @@
       <if test="batchNo != null and batchNo != ''">
         AND a.batchNo = #{batchNo}
       </if>
+      <if test="erpId != null and erpId != ''">
+        AND a.erpId = #{erpId}
+      </if>
       <if test="keyWords != '' and keyWords != null">
         and (
         a.productCode LIKE concat('%', #{keyWords}, '%')