xufenglei
2018-07-20 d8680e96da9c51f22fae430fc493f110cb374e5b
空值处理
1 files modified
18 ■■■■■ changed files
src/main/java/com/moral/service/impl/HistoryServiceImpl.java 18 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -158,16 +158,20 @@
        accountService.setOrgIdsByAccount(parameters);
        
        List<Map<String, Object>> result = historyMapper.getRegionRankingData(parameters);
        for (Map<String, Object> map : result) {
            if (ObjectUtils.isEmpty(map.get("avg"))) {
                map.put("avg", 0);
            }
        }
        if ("profession".equals(parameters.get("dimension"))) {
            List<Profession> professions = professionMapper.selectAll();
            for (Map<String, Object> map : result) {
                for (Profession profession : professions) {
                    if (map.get("name").equals(profession.getName())) {
                        professions.remove(profession);
                        if (ObjectUtils.isEmpty(map.get("avg"))) {
                            map.put("avg", 0);
                        }
//                        if (ObjectUtils.isEmpty(map.get("avg"))) {
//                            map.put("avg", 0);
//                        }
                        break;
                    }
                }
@@ -183,9 +187,9 @@
            for (Map<String, Object> map : result) {
                if (regions.contains(map.get("name"))) {
                    regions.remove(map.get("name"));
                    if (ObjectUtils.isEmpty(map.get("avg"))) {
                        map.put("avg", 0);
                    }
//                    if (ObjectUtils.isEmpty(map.get("avg"))) {
//                        map.put("avg", 0);
//                    }
                }
                
            }