From e2ec753e232106f336894f58d585e58c27bf1f29 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 30 七月 2026 17:04:43 +0800
Subject: [PATCH] 各类修复
---
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
index 1c7e24c..5ef5c69 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
@@ -39,7 +39,26 @@
AND tas.audit_status = #{query.auditStatus}
</if>
<if test="query.partnerId != null">
- AND tas.partner_id = #{query.partnerId}
+ AND (
+ tas.partner_id = #{query.partnerId}
+ OR EXISTS (
+ SELECT 1
+ FROM t_accounting_strategy audit_tas
+ WHERE audit_tas.parent_id = tas.id
+ AND audit_tas.partner_id = #{query.partnerId}
+ AND audit_tas.audit_status IN (1, 2, 4)
+ AND audit_tas.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
+ AND audit_tas.id = (
+ SELECT latest_audit_tas.id
+ FROM t_accounting_strategy latest_audit_tas
+ WHERE latest_audit_tas.parent_id = tas.id
+ AND latest_audit_tas.audit_status IN (1, 2, 4)
+ AND latest_audit_tas.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
+ ORDER BY latest_audit_tas.create_time DESC, latest_audit_tas.id DESC
+ LIMIT 1
+ )
+ )
+ )
</if>
AND tas.site_id IS NULL
AND (tas.parent_id IS NULL OR tas.audit_status = 3 OR tas.audit_status = 4)
--
Gitblit v1.7.1