From efc5dece153d8e51f9e18e136a35558c4ae8a894 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 09 五月 2024 14:47:33 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
index 2b3ae6f..8612950 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
@@ -114,19 +114,16 @@
*/
@Override
public List<MdcDeviceCalendarVo> listByEquipmentAndDate(String equipmentId, List<String> stringDates) {
- List<MdcDeviceCalendarVo> result = new ArrayList<>();
try {
- for (String stringDate : stringDates) {
- List<MdcDeviceCalendarVo> mdcDeviceCalendarVos = this.baseMapper.listByEquipmentAndDate(equipmentId, stringDate);
- if (mdcDeviceCalendarVos != null && !mdcDeviceCalendarVos.isEmpty()) {
- result.addAll(mdcDeviceCalendarVos);
- }
+ List<MdcDeviceCalendarVo> mdcDeviceCalendarVos = this.baseMapper.listByEquipmentAndDates(equipmentId, stringDates);
+ if (mdcDeviceCalendarVos != null && !mdcDeviceCalendarVos.isEmpty()) {
+ return mdcDeviceCalendarVos;
+ } else {
+ return null;
}
} catch (Exception e) {
- e.printStackTrace();
+ return null;
}
-
- return result;
}
/**
--
Gitblit v1.9.3