From 38a92bc8a3eb615ed3a93381e1a24891de45e9f9 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 07 Jul 2024 14:02:12 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/resources/mapper/UserPositionMapper.xml b/src/main/resources/mapper/UserPositionMapper.xml
index f96e1da..1edb775 100644
--- a/src/main/resources/mapper/UserPositionMapper.xml
+++ b/src/main/resources/mapper/UserPositionMapper.xml
@@ -454,9 +454,9 @@
       <if test="stockSpell != null and stockSpell != '' ">
         and stock_spell like CONCAT('%','${stockSpell}','%')
       </if>
-      <if test="stockType != null and stockType!= ''">
-        and stock_gid = #{stockType}
-      </if>
+<!--      <if test="stockType != null and stockType!= ''">-->
+<!--        and stock_gid = #{stockType}-->
+<!--      </if>-->
 
 
     </where>
@@ -485,7 +485,7 @@
     <include refid="Base_Column_List"/>
     FROM user_position
     <where>
-      <if test="searchId != null  ">
+      <if test="searchId != null  and searchId != '' ">
         and agent_id = #{searchId}
       </if>
       <if test="state != null  ">
@@ -502,15 +502,19 @@
       <if test="positionSn != null and positionSn != '' ">
         and position_sn like CONCAT('%','${positionSn}','%')
       </if>
-      <if test="positionType != null ">
+      <if test="positionType != null and positionType != ''">
         and position_type = #{positionType}
       </if>
-      <if test="beginTime != null ">
+      <if test="beginTime != null and beginTime != ''">
         and sell_order_time <![CDATA[>=]]> #{beginTime}
       </if>
-      <if test="endTime != null ">
+      <if test="endTime != null and endTime != ''">
         and sell_order_time <![CDATA[<=]]> #{endTime}
       </if>
+      <if test="phone != null and phone != ''">
+        and user_id  = (select id from  user where phone =  #{phone})
+      </if>
+
     </where>
     ORDER BY id DESC
   </select>
@@ -603,5 +607,7 @@
     limit 1
   </select>
 
+
+
 </mapper>
 

--
Gitblit v1.9.3