chore:补充提交

jinpengyong

2023-11-01 74c430e012ade8363b57949357e3cf653b944a2d

 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;
    }