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 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 @@ 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 and s.name like concat('%', #{params.stationName}, '%') 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 @@