From 7aaff8e196d61cfc26d4fefa39cb4f6a9d7cf42a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 13 四月 2022 18:11:43 +0800
Subject: [PATCH] 灯杆倾斜设备表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 14 ++++++++------
1 files changed, 8 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..3d6e5d2 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
@@ -38,13 +38,15 @@
* 妯＄硦鏌ヨ
*/
public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
+ Long userId = SecurityUtils.getUserId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> listAirEquipmentId = waterQualityEquipmentMapper.WaterQualityEquipmentId(keyword, clientId);
- if (CollUtil.isEmpty(listAirEquipmentId)) {
- return CollUtil.newArrayList();
+ List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, null);
+ } else {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, userId);
}
- List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(listAirEquipmentId);
return waterQualityEquipmentBoList;
}
@@ -60,7 +62,7 @@
throw new BusinessException("鎵句笉鍒版按璐ㄨ澶�");
}
//鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
- poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());
+ poleBindingService.unBindPole(null, waterQualityEquipment.getWaterQualityEquipmentCode());
return removeById(Id);
}
--
Gitblit v1.9.3