From 4d18a9dc06ea0730e048396c3e8fd88c35dab347 Mon Sep 17 00:00:00 2001
From: 7548901 <7548901@qq.com>
Date: Fri, 21 Mar 2025 10:50:00 +0800
Subject: [PATCH] 2
---
.../infrastructure/mapper/xml/IncomeMapper.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/IncomeMapper.xml b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/IncomeMapper.xml
index 2bb27bf5..838bc271 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/IncomeMapper.xml
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/IncomeMapper.xml
@@ -798,13 +798,12 @@
left join t_invoice d on c.invoice_id=d.id
left join t_income_voucher e on e.income_id = a.id
<where>
- a.available = 'YES' and a.is_offline =1 and a.income_speed
- in ('棰勫垎閰�','鍒嗛厤','鍙戝竷','寰呰棰�','涓氬姟琛ュ厖','寮€绁�','鍏ヨ处','瀹屾垚')
+ a.available = 'YES' and a.is_offline =1
<if test="qry.relateState!=null and qry.relateState == '宸插叧鑱�'">
- and e.id is not null
+ and e.id is not null and a.income_speed='瀹屾垚'
</if>
<if test="qry.relateState!=null and qry.relateState == '鏈叧鑱�'">
- and e.id is null
+ and e.id is null and a.income_speed in ('棰勫垎閰�','鍒嗛厤','鍙戝竷','寰呰棰�','涓氬姟琛ュ厖','寮€绁�','鍏ヨ处')
</if>
<if test="qry.billNo != null and qry.billNo!=''">
and a.bill_no like concat('%',#{qry.billNo},'%')
--
GitLab