From a0799df777d6507857162a1f30a8f514075a4981 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 23 May 2025 11:33:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(mapper):=20=E5=A2=9E=E5=8A=A0=E7=9C=81?=
 =?UTF-8?q?=E4=BB=BD=E5=92=8C=E5=9F=8E=E5=B8=82=E7=AD=9B=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 AgentInfoMapper 和 PartnerInfoMapper 中添加省份和城市筛选条件
- 优化 AgentInfoMapper、CustomerInfoMapper 和 PartnerInfoMapper 中的模糊查询逻辑
---
 .../src/main/resources/mapper/manage/CustomerInfoMapper.xml   | 2 +-
 .../src/main/resources/mapper/system/AgentInfoMapper.xml      | 4 +++-
 .../src/main/resources/mapper/system/PartnerInfoMapper.xml    | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-sip/src/main/resources/mapper/manage/CustomerInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/CustomerInfoMapper.xml
index 5c0c7a44..cd73eac2 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/CustomerInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/CustomerInfoMapper.xml
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCustomerInfoList" parameterType="CustomerInfo" resultMap="CustomerInfoResult">
         <include refid="selectCustomerInfoVo"/>
         <where>
-            <if test="customerCode != null  and customerCode != ''">and customer_code = #{customerCode}</if>
+            <if test="customerCode != null  and customerCode != ''">and customer_code like  concat( '%',#{customerCode},'%')</if>
             <if test="customerCodeList != null  and customerCodeList.size>0">and customer_code in
                 <foreach collection="customerCodeList" item="item" separator="," open="(" close=")">
                     #{item}
diff --git a/ruoyi-sip/src/main/resources/mapper/system/AgentInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/AgentInfoMapper.xml
index ea2c8a5d..b01edc4d 100644
--- a/ruoyi-sip/src/main/resources/mapper/system/AgentInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/system/AgentInfoMapper.xml
@@ -28,13 +28,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAgentInfoList" parameterType="AgentInfo" resultMap="AgentInfoResult">
         <include refid="selectAgentInfoVo"/>
         <where>  
-            <if test="agentCode != null  and agentCode != ''"> and agent_code = #{agentCode}</if>
+            <if test="agentCode != null  and agentCode != ''"> and agent_code  like concat('%', #{agentCode}, '%')</if>
             <if test="agentCodeList != null  and agentCodeList.size>0"> and agent_code in
               <foreach collection="agentCodeList"  item="item" open="(" close=")" separator=",">
                   #{item}
               </foreach>
             </if>
             <if test="agentName != null  and agentName != ''"> and agent_name like concat('%', #{agentName}, '%')</if>
+            <if test="province != null  and province != ''">and province = #{province}</if>
+            <if test="city != null  and city != ''">and city = #{city}</if>
         </where>
     </select>
     
diff --git a/ruoyi-sip/src/main/resources/mapper/system/PartnerInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/PartnerInfoMapper.xml
index 9c77684c..69a15678 100644
--- a/ruoyi-sip/src/main/resources/mapper/system/PartnerInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/system/PartnerInfoMapper.xml
@@ -27,9 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPartnerInfoList" parameterType="PartnerInfo" resultMap="PartnerInfoResult">
         <include refid="selectPartnerInfoVo"/>
         <where>  
-            <if test="partnerCode != null  and partnerCode != ''"> and partner_code = #{partnerCode}</if>
+            <if test="partnerCode != null  and partnerCode != ''"> and partner_code like concat('%', #{partnerCode}, '%')</if>
             <if test="partnerName != null  and partnerName != ''"> and partner_name like concat('%', #{partnerName}, '%')</if>
             <if test="level != null  and level != ''"> and level = #{level}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
         </where>
     </select>