From 9e530fa2aee385cb331e3c76d0765e78c40e35f7 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 10 十月 2024 13:44:08 +0800
Subject: [PATCH] 1.增加基类是ID是string且是逻辑删的 2.财务报表-合伙人报表

---
 src/main/resources/mapper/payment/OrderSettlementMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/payment/OrderSettlementMapper.xml b/src/main/resources/mapper/payment/OrderSettlementMapper.xml
index a318b4b..05ec5ba 100644
--- a/src/main/resources/mapper/payment/OrderSettlementMapper.xml
+++ b/src/main/resources/mapper/payment/OrderSettlementMapper.xml
@@ -23,8 +23,10 @@
         <if test="condition.endDate != null">
             AND s.create_time &lt;= #{condition.endDate}
         </if>
-
-        ORDER BY s.create_time desc
+        <if test="condition.userName != null and condition.userName != ''">
+            AND (si.name LIKE CONCAT('%', #{condition.userName}, '%') OR pi.name LIKE CONCAT('%', #{condition.userName}, '%'))
+        </if>
+        ORDER BY s.create_time desc, userName
     </select>
 
     <select id="getUserIncome" resultType="java.math.BigDecimal">

--
Gitblit v1.9.3