From ae6cbc46dcbb0f3fec029f892281d9bfa8587e2e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 5 May 2025 13:01:44 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisSettleInvoiceRelController.java   | 3 +++
 .../src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRelController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRelController.java
index 4ba73b29b..3f0966630 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRelController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRelController.java
@@ -15,6 +15,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.emis.domain.EmisSettlePayRel;
+import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -58,6 +59,8 @@ public class EmisSettleInvoiceRelController extends BaseController
     public TableDataInfo list(EmisSettleInvoiceRel emisSettleInvoiceRel)
     {
         startPage();
+        emisSettleInvoiceRel.setApplySeqNo(WaybillHelper.formatQueryValue(emisSettleInvoiceRel.getApplySeqNo()));
+
         List<EmisSettleInvoiceRel> list = emisSettleInvoiceRelService.selectEmisSettleInvoiceRelList(emisSettleInvoiceRel);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
index c190d04cd..760da47df 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
@@ -29,8 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="applySeqNo != null  and applySeqNo != ''"> and apply_seq_no=#{applySeqNo}</if>
-            <if test="payId != null  and payId != ''"> and pay_id like concat('%', #{payId}, '%')</if>
+            <if test="applySeqNo != null  and applySeqNo != ''"> and FIND_IN_SET(apply_seq_no, #{applySeqNo} )</if>
+            <if test="payId != null  and payId != ''"> and pay_id=#{payId}</if>
             <if test="billNo != null  and billNo != ''"> and bill_no like concat('%', #{billNo}, '%')</if>
             <if test="money != null "> and money = #{money}</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>