From 84de09d96c2c2059f545d5615fb1b30bcd88e557 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 25 Jun 2025 11:01:23 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E6=96=B0=E5=A2=9E=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=BD=91=E7=82=B9=E6=8E=A5=E5=8F=A3=E3=80=82=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E4=BE=9B=E5=BA=94=E5=95=86=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9EnameEn.=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emis-biz/src/main/resources/mapper/EmisSiteMapper.xml    | 2 ++
 .../src/main/resources/mapper/EmisSupplierMapper.xml     | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
index c7e26053c..43a72542c 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
@@ -773,6 +773,8 @@
             <if test="params.startSiteCode != null  and params.startSiteCode != ''">and r.start_site_code =
                 #{params.startSiteCode}
             </if>
+            <if test="siteCode != null  and siteCode != ''"> and r.next_site_code = #{siteCode}</if>
+            <if test="siteName != null  and siteName != ''"> and s.site_name LIKE CONCAT('%', #{siteName}, '%')</if>
         </where>
         order by r.id desc
     </select>
diff --git a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
index 5df9cc88c..cf0e30d22 100644
--- a/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
@@ -273,6 +273,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             r.del_flag = '0'
             <if test="params.startSiteCode != null  and params.startSiteCode != ''"> and r.start_site_code = #{params.startSiteCode}</if>
             <if test="params.nextSiteCode != null  and params.nextSiteCode != ''"> and r.next_site_code = #{params.nextSiteCode}</if>
+            <if test="code != null  and code != ''"> and ( FIND_IN_SET(#{code},r.supplier_code) )</if>
+            <if test="name != null  and name != ''"> 
+                and EXISTS (
+                    SELECT 1 FROM emis_supplier s 
+                    WHERE FIND_IN_SET(s.code, r.supplier_code) 
+                    AND s.del_flag = '0' 
+                    AND s.name LIKE CONCAT('%', #{name}, '%')
+                )
+            </if>
         </where>
         order by id desc
     </select>