From f2f77f203fd6b054197ecaba0517a159e8b3ac8f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 30 Oct 2023 15:48:24 +0800
Subject: [PATCH] fix：补偿0问题修改
---
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
index aeefda9..1863fba 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
@@ -273,7 +273,7 @@
@Override
@Transactional
- public Map<String, Object> dailyDustlds(List<MultipartFile> file,Map<String, Object> params) {
+ public Map<String, Object> dailyDustlds(Map<String, Object> params) {
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
@@ -287,6 +287,9 @@
HashMap<String, Object> rsMap = new HashMap<>();
List<Map<String, Object>> dusts = historySecondCruiserMapper.getDusts(params);
Map<String, List<DustldDTO>> collect = manageCoordinateMapper.CompareTo(orgId).stream().collect(Collectors.groupingBy(o -> o.getName()));
+ if (ObjectUtils.isEmpty(dusts) || ObjectUtils.isEmpty(collect)){
+ return null;
+ }
Set<String> strings = collect.keySet();
ArrayList<DustForm> list1 = new ArrayList<>();
//���������������������
@@ -388,7 +391,7 @@
}
}
}
- rsMap.put("data",builder);
+ rsMap.put("data",ObjectUtils.isEmpty(builder)?"������������������":builder);
rsMap.put("list3",list3);
rsMap.put("time",rsTime1+"-"+rsTime2);
rsMap.put("date1",dateString3.substring(5,10));
--
Gitblit v1.8.0