From ea772fcdef390ca8bdb6746a1504e5ca88037d00 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 27 Jun 2025 16:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/resources/mapper/UserStockSubscribeMapper.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/UserStockSubscribeMapper.xml b/src/main/resources/mapper/UserStockSubscribeMapper.xml
index dbad41a..86f0b91 100644
--- a/src/main/resources/mapper/UserStockSubscribeMapper.xml
+++ b/src/main/resources/mapper/UserStockSubscribeMapper.xml
@@ -213,6 +213,15 @@
<if test="keyword != null and keyword != ''">
and (user_id = #{keyword} or real_name like CONCAT('%',#{keyword},'%') or phone like CONCAT('%',#{keyword},'%'))
</if>
+ <if test="agentId != null and agentId != ''">
+ and agent_id = #{agentId}
+ </if>
+ <if test="name != null and name != ''">
+ and new_name = #{name}
+ </if>
+ <if test="status != null and status != ''">
+ and status = #{status}
+ </if>
order by id desc
</select>
--
Gitblit v1.9.3