From 410c7c167cad4c7b5a24077b16c7e5e102c6a746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Fri, 30 Oct 2026 11:58:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=A2=E5=95=86=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E7=AD=9B=E9=80=89=E4=B8=8D=E5=86=8D=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E9=BB=91=E5=90=8D=E5=8D=95=EF=BC=88=E4=B8=8E=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E5=B1=95=E7=A4=BA=E5=8F=A3=E5=BE=84=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transport/mapper/CustomerArchiveMapper.xml            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
index fd345444..a0038ecc 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
@@ -181,20 +181,20 @@
         <if test="customer.createTimeEnd != null">
             AND create_time &lt;= #{customer.createTimeEnd}
         </if>
-        <!-- 客商风险筛选：黑名单优先，等级筛选排除黑名单避免重复命中 -->
+        <!-- 客商风险筛选：blacklist 按黑名单状态过滤；等级筛选与黑名单独立（黑名单客商也有等级，组合展示口径一致） -->
         <if test="customer.customerRisk != null and customer.customerRisk != ''">
             <choose>
                 <when test="customer.customerRisk == 'blacklist'">
                     AND hcs_black_status = 'yes'
                 </when>
                 <when test="customer.customerRisk == 'high'">
-                    AND hcs_risk_level = '2' AND (hcs_black_status IS NULL OR hcs_black_status != 'yes')
+                    AND hcs_risk_level = '2'
                 </when>
                 <when test="customer.customerRisk == 'middle'">
-                    AND hcs_risk_level = '1' AND (hcs_black_status IS NULL OR hcs_black_status != 'yes')
+                    AND hcs_risk_level = '1'
                 </when>
                 <otherwise>
-                    AND hcs_risk_level = '0' AND (hcs_black_status IS NULL OR hcs_black_status != 'yes')
+                    AND hcs_risk_level = '0'
                 </otherwise>
             </choose>
         </if>