From 4450dd41e8d5828e5da4d277c86e54551a6b6c15 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Dec 2021 09:06:28 +0800
Subject: [PATCH] 设备新增，修改是工艺字段可以为多个，修改mapper,sql
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
index 4895d63..d9a8d2f 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -51,9 +51,12 @@
wrapper.eq("mac",mac);
wrapper.eq("time",date);
List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper);
+ if(ObjectUtils.isEmpty(historyDailies))
+ return null;
return historyDailies.get(0);
}
+
@Override
public Map<String, HistoryDaily> getHistoryDailyByMacsAndDate(List<String> mac, Date date) {
QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>();
--
Gitblit v1.8.0