From 91f82652d3a19efa3da0be659aa8954bbde2c712 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 28 Oct 2025 14:03:59 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/UserWithdrawMapper.xml |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/UserWithdrawMapper.xml b/src/main/resources/mapper/UserWithdrawMapper.xml
index 6311b02..2313218 100644
--- a/src/main/resources/mapper/UserWithdrawMapper.xml
+++ b/src/main/resources/mapper/UserWithdrawMapper.xml
@@ -16,10 +16,11 @@
       <result column="with_status"  property="withStatus"/>
       <result column="with_fee"  property="withFee"/>
       <result column="with_msg"  property="withMsg"/>
+      <result column="accset_type"  property="accsetType"/>
   </resultMap>
   <sql id="Base_Column_List" >
     id, user_id, nick_name, agent_id, with_amt, apply_time, trans_time, with_name, bank_no, 
-    bank_name, bank_address, with_status, with_fee, with_msg
+    bank_name, bank_address, with_status, with_fee, with_msg, accset_type
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -36,12 +37,12 @@
       agent_id, with_amt, apply_time, 
       trans_time, with_name, bank_no, 
       bank_name, bank_address, with_status, 
-      with_fee, with_msg)
+      with_fee, with_msg, accset_type)
     values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{nickName,jdbcType=VARCHAR}, 
       #{agentId,jdbcType=INTEGER}, #{withAmt,jdbcType=DECIMAL}, #{applyTime,jdbcType=TIMESTAMP}, 
       #{transTime,jdbcType=TIMESTAMP}, #{withName,jdbcType=VARCHAR}, #{bankNo,jdbcType=VARCHAR}, 
       #{bankName,jdbcType=VARCHAR}, #{bankAddress,jdbcType=VARCHAR}, #{withStatus,jdbcType=INTEGER}, 
-      #{withFee,jdbcType=DECIMAL}, #{withMsg,jdbcType=VARCHAR})
+      #{withFee,jdbcType=DECIMAL}, #{withMsg,jdbcType=VARCHAR}, #{accsetType,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.nq.pojo.UserWithdraw" >
     insert into user_withdraw
@@ -235,8 +236,8 @@
     SELECT
     <include refid="Base_Column_List"/>
     FROM user_withdraw
-    where agent_id != 1
-      <if test="agentId != null">
+    where 1=1
+      <if test="agentId != null and agentId != ''">
         and ( agent_id = #{agentId}
         or agent_id in (
         select agent_user.id
@@ -245,7 +246,7 @@
         )
         )
       </if>
-      <if test="userId != null">
+      <if test="userId != null and agentId != ''">
         and user_id = #{userId}
       </if>
       <if test="realName != null and realName != '' ">

--
Gitblit v1.9.3