From 30a53e728373c42d4683372f0dc7da9f31286ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 16 Apr 2026 17:42:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(db):=20=E4=BC=98=E5=8C=96ShopDealerApply?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=94=AF=E6=8C=81=E6=8E=A5?=
 =?UTF-8?q?=E5=BE=85=E4=BA=BA=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改ShopDealerApplyMapper.xml，增加接待人ID和申请用户ID的联合过滤条件
- 支持当接待人ID与申请用户ID都存在时，进行多条件OR查询
- 支持单独存在接待人ID时的过滤条件
- 在ShopDealerApplyParam中新增receptionistId字段，支持接待人用户ID查询参数
- 完善查询条件逻辑，提高业务灵活性和数据筛选能力
---
 .../gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml   | 8 +++++++-
 .../com/gxwebsoft/shop/param/ShopDealerApplyParam.java    | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml
index 7f89064..f34a86b 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml
@@ -16,7 +16,10 @@
             <if test="param.type != null">
               AND a.type = #{param.type}
             </if>
-            <if test="param.userId != null">
+            <if test="param.userId != null and param.receptionistId != null">
+                AND (a.user_id = #{param.userId} OR a.receptionist_id = #{param.receptionistId})
+            </if>
+            <if test="param.userId != null and param.receptionistId == null">
                 AND a.user_id = #{param.userId}
             </if>
             <if test="param.realName != null">
@@ -46,6 +49,9 @@
             <if test="param.refereeId != null">
                 AND a.referee_id = #{param.refereeId}
             </if>
+            <if test="param.receptionistId != null and param.userId == null">
+                AND a.receptionist_id = #{param.receptionistId}
+            </if>
             <if test="param.applyType != null">
                 AND a.apply_type = #{param.applyType}
             </if>
diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java
index 684a029..33d20bd 100644
--- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java
@@ -59,6 +59,10 @@ public class ShopDealerApplyParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer refereeId;
 
+    @Schema(description = "接待人用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer receptionistId;
+
     @Schema(description = "申请方式(10需后台审核 20无需审核)")
     @QueryField(type = QueryType.EQ)
     private Integer applyType;