From 4e26756b058323942603de62a6a1ec225cb9aab6 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Tue, 10 May 2022 17:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E5=8D=95=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=BE=E5=A4=87=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/XhpcChargingPileMapper.xml        | 2 +-
 .../src/main/resources/mapper/XhpcChargingStationMapper.xml     | 2 +-
 .../src/main/resources/mapper/XhpcStationDeviceMapper.xml       | 2 +-
 .../src/main/resources/mapper/XhpcTerminalMapper.xml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingPileMapper.xml
index 25fbbcff..f93a9eb7 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingPileMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingPileMapper.xml
@@ -472,6 +472,6 @@
             current,
             equipment_type equipmentType
         from xhpc_charging_pile
-        where charging_station_id = #{stationId}
+        where charging_station_id = #{stationId} and del_flag=0
     </select>
 </mapper>
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingStationMapper.xml
index 9546176d..320585c9 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingStationMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingStationMapper.xml
@@ -65,6 +65,6 @@
 
 
     <select id="selectAll" resultType="com.xhpc.common.domain.XhpcChargingStation">
-        select * from xhpc_charging_station
+        select * from xhpc_charging_station where del_flag=0
     </select>
 </mapper>
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcStationDeviceMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcStationDeviceMapper.xml
index 320c2346..0f0686dc 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcStationDeviceMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcStationDeviceMapper.xml
@@ -54,7 +54,7 @@
     LEFT JOIN xhpc_work_station s on s.work_station_id=d1.station_id
     LEFT JOIN xhpc_station_device d2 on d2.parent_device_id=d1.device_id
     LEFT JOIN xhpc_terminal t on t.serial_number = d2.serial_number
-    WHERE s.del_flag=0 and d1.del_flag=0 and d2.del_flag=0 and d1.device_type='PILE'
+    WHERE s.del_flag=0 and d1.del_flag=0 and d2.del_flag=0 and d1.device_type='PILE' and t.del_flag=0
     <if test="params.stationName!=null and params.stationName != ''">
       and s.name like concat('%', #{params.stationName}, '%')
     </if>
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTerminalMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTerminalMapper.xml
index 0189b331..de3c4aeb 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTerminalMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTerminalMapper.xml
@@ -405,6 +405,6 @@
 
     <select id="selectByPileId" resultMap="BaseResultMap">
         <include refid="selectXhpcTerminalVo"/>
-        WHERE charging_pile_id = #{pileId}
+        WHERE charging_pile_id = #{pileId} and del_flag=0
     </select>
 </mapper>