From efdecc7019261f8fdc875505281f54ef7a3bfbce Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 19 二月 2025 12:30:09 +0800
Subject: [PATCH] 大屏看板
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index ad9d45f..04bd56a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -703,23 +703,24 @@
@Override
public List<String> listEquipmentId(MdcEfficiencyReportQueryVo vo) {
LambdaQueryWrapper<MdcEquipment> queryWrapper = new LambdaQueryWrapper<>();
- if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) {
- queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList());
- }
- if (StringUtils.isNotEmpty(vo.getEquipmentType())) {
- queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(",")));
- }
- if (StringUtils.isNotEmpty(vo.getDeviceLevel())) {
- queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(",")));
- }
- if (StringUtils.isNotEmpty(vo.getDriveType())) {
- queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(",")));
- }
- if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
- queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
+ if (vo != null) {
+ if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) {
+ queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList());
+ }
+ if (StringUtils.isNotEmpty(vo.getEquipmentType())) {
+ queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDeviceLevel())) {
+ queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDriveType())) {
+ queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
+ queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
+ }
}
List<MdcEquipment> list = super.list(queryWrapper);
-// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
}
@@ -873,5 +874,4 @@
// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
}
-
}
--
Gitblit v1.9.3