From f233ba26bbf8703fcc4e86a5dbb9d6026f91e7d6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 04 三月 2022 18:14:03 +0800
Subject: [PATCH] C3充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
index a8ba748..80ad2e7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
@@ -40,11 +40,8 @@
public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> listAirEquipmentId = waterQualityEquipmentMapper.WaterQualityEquipmentId(keyword, clientId);
- if (CollUtil.isEmpty(listAirEquipmentId)) {
- return CollUtil.newArrayList();
- }
- List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(listAirEquipmentId);
+
+ List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, clientId);
return waterQualityEquipmentBoList;
}
@@ -60,7 +57,7 @@
throw new BusinessException("鎵句笉鍒版按璐ㄨ澶�");
}
//鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
- poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());
+ poleBindingService.unBindPole(null, waterQualityEquipment.getWaterQualityEquipmentCode());
return removeById(Id);
}
--
Gitblit v1.9.3