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/AgentUserMapper.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/AgentUserMapper.xml b/src/main/resources/mapper/AgentUserMapper.xml
index f4041aa..93d68bb 100644
--- a/src/main/resources/mapper/AgentUserMapper.xml
+++ b/src/main/resources/mapper/AgentUserMapper.xml
@@ -23,7 +23,7 @@
</constructor>
</resultMap>
<sql id="Base_Column_List" >
- id, agent_name, agent_pwd, agent_real_name, agent_phone, agent_code, add_time, is_lock,
+ id, agent_name, agent_pwd, agent_real_name, agent_phone, agent_code, add_time, is_lock,
parent_id, parent_name, agent_level,poundage_scale,deferred_fees_scale,receive_dividends_scale,
total_money,site_lever,on_line_services
</sql>
@@ -195,6 +195,28 @@
FROM agent_user
WHERE agent_code = #{agentCode}
</select>
+ <select id="findByCodeAndNeid" resultMap="BaseResultMap">
+ SELECT
+ <include refid="Base_Column_List"/>
+ FROM agent_user
+ WHERE agent_code = #{agentCode} and id != #{id}
+ </select>
+
+ <select id="findByParentId" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+ SELECT
+ <include refid="Base_Column_List"/>
+ FROM agent_user
+ WHERE parent_id = #{parentId}
+ </select>
+
+ <select id="getParensAgent" resultMap="BaseResultMap">
+ SELECT
+ <include refid="Base_Column_List"/>
+ FROM agent_user
+ WHERE agent_level = 0 or agent_level = 1
+ ORDER BY id asc
+ </select>
+
<select id="findByPhone" resultMap="BaseResultMap" parameterType="string">
SELECT
@@ -222,8 +244,7 @@
SELECT
a.*
FROM agent_user a
- left join agent_distribution_user d on a.id = d.agent_id
- WHERE d.parent_id = #{uid}
+ WHERE a.parent_id = #{uid}
</select>
<select id="listByAdmin" parameterType="map" resultMap="BaseResultMap">
--
Gitblit v1.9.3