From 1cf06ae5c986e1661d6f1e4b50b5e8042f49b843 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 03 十一月 2024 13:22:20 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml | 2 +-
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml | 2 +-
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml | 2 +-
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml | 2 +-
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
index 4851c30..e9a3d00 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
@@ -97,7 +97,7 @@
<if test="null != item.districtsCode and '' != item.districtsCode">
and a.districts_code = #{item.districtsCode}
</if>
- <if test="null != ids">
+ <if test="null != ids and ids.size() > 0">
and a.id in
<foreach collection="ids" item="itemm" index="index" open="(" separator="," close=")">
#{itemm}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
index 1553995..eff0ffe 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
@@ -58,7 +58,7 @@
<if test="query.chargeMode != null">
AND tcg.charge_mode = #{query.chargeMode}
</if>
- <if test="null != siteIds">
+ <if test="null != siteIds and siteIds.size() > 0">
and tcg.site_id in
<foreach collection="siteIds" index="index" item="item" open="(" separator="," close=")">
#{item}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
index 57d5c2b..ad9b8d2 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
@@ -56,7 +56,7 @@
<if test="null != item.type">
and a.type = #{item.type}
</if>
- <if test="null != siteIds">
+ <if test="null != siteIds and siteIds.size() > 0">
and a.site_id in
<foreach collection="siteIds" item="itemm" index="index" open="(" separator="," close=")">
#{itemm}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
index 2901664..ec5a430 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
@@ -44,7 +44,7 @@
from t_charging_pile_notification a
left join t_site b on (a.site_id = b.id)
where a.del_flag = 0
- <if test="null != siteIds">
+ <if test="null != siteIds and siteIds.size() > 0">
and a.site_id in
<foreach collection="siteIds" item="item" index="index" open="(" separator="," close=")">
#{item}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
index 872f114..8bdfc50 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
@@ -144,7 +144,7 @@
LEFT JOIN `charging_pile_other`.`t_evaluation_tag` tt on ot.evaluation_tag_id = tt.id
WHERE ot.evaluation_tag_id in (
SELECT id from `charging_pile_other`.`t_evaluation_tag` WHERE type = 1
- ) <if test="null != siteIds">
+ ) <if test="null != siteIds and siteIds.size() > 0">
and co.site_id in
<foreach collection="siteIds" item="item" index="index" open="(" separator="," close=")">
#{item}
@@ -171,7 +171,7 @@
LEFT JOIN `charging_pile_other`.`t_evaluation_tag` tt on ot.evaluation_tag_id = tt.id
WHERE ot.evaluation_tag_id in (
SELECT id from `charging_pile_other`.`t_evaluation_tag` WHERE type = 3
- ) <if test="null != siteIds">
+ ) <if test="null != siteIds and siteIds.size() > 0">
and co.site_id in
<foreach collection="siteIds" item="item" index="index" open="(" separator="," close=")">
#{item}
--
Gitblit v1.7.1