From 5bbbefadb317d2d9c0c66d86c7ee7f8c3dcb19a3 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 16 五月 2024 16:37:46 +0800 Subject: [PATCH] 问题反馈 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 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 b9a7384..c5db8a6 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 @@ -730,16 +730,16 @@ queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList()); } if (StringUtils.isNotEmpty(vo.getEquipmentType())) { - queryWrapper.eq(MdcEquipment::getEquipmentType, vo.getEquipmentType()); + queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(","))); } if (StringUtils.isNotEmpty(vo.getDeviceLevel())) { - queryWrapper.eq(MdcEquipment::getDeviceLevel, vo.getDeviceLevel()); + queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(","))); } if (StringUtils.isNotEmpty(vo.getDriveType())) { - queryWrapper.eq(MdcEquipment::getDriveType, vo.getDriveType()); + queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(","))); } if (StringUtils.isNotEmpty(vo.getDeviceCategory())) { - queryWrapper.eq(MdcEquipment::getDeviceCategory, 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)); @@ -880,16 +880,16 @@ queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList()); } if (StringUtils.isNotEmpty(vo.getEquipmentType())) { - queryWrapper.eq(MdcEquipment::getEquipmentType, vo.getEquipmentType()); + queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(","))); } if (StringUtils.isNotEmpty(vo.getDeviceLevel())) { - queryWrapper.eq(MdcEquipment::getDeviceLevel, vo.getDeviceLevel()); + queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(","))); } if (StringUtils.isNotEmpty(vo.getDriveType())) { - queryWrapper.eq(MdcEquipment::getDriveType, vo.getDriveType()); + queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(","))); } if (StringUtils.isNotEmpty(vo.getDeviceCategory())) { - queryWrapper.eq(MdcEquipment::getDeviceCategory, 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)); -- Gitblit v1.9.3