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 @@
and r.start_site_code =
#{params.startSiteCode}
+ and r.next_site_code = #{siteCode}
+ and s.site_name LIKE CONCAT('%', #{siteName}, '%')
order by r.id desc
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'
and r.start_site_code = #{params.startSiteCode}
and r.next_site_code = #{params.nextSiteCode}
+ and ( FIND_IN_SET(#{code},r.supplier_code) )
+
+ 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}, '%')
+ )
+
order by id desc