From 2573d09a4a305b7cb4ba9ab82daa8a8e2a4cdeb4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 20:02:25 +0800
Subject: [PATCH] feat:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
index 2608c7b..18ae1e2 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
@@ -6,14 +6,7 @@
import org.springframework.util.ObjectUtils;
import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
@@ -103,8 +96,10 @@
List<Map<String, Object>> devices = deviceService.getDevicesByOrganizationId(organizationId);
Set<Map<String, Object>> result = new HashSet<>();
for (Map<String, Object> device : devices) {
- List<Map<String, Object>> professions = (List<Map<String, Object>>) device.get("professions");
- result.addAll(professions);
+ if(Objects.nonNull(device)&&Objects.nonNull(device.get("professions"))&&device.containsKey("professions")){
+ List<Map<String, Object>> professions = (List<Map<String, Object>>) device.get("professions");
+ result.addAll(professions);
+ }
}
return result;
}
--
Gitblit v1.8.0