首页经营数据

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -327,6 +327,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	}
 
 	public List<IndexBaseMonthData> getOrganIndexMonthData(List<IndexBaseMonthData> organIndexMonthData,IndexDataType indexDataType,Set<Integer> queryOrganIds) {
+		List<IndexBaseMonthData> dataList = new ArrayList<>();
 		if (!CollectionUtils.isEmpty(organIndexMonthData)){
 			List<IndexBaseMonthData> collect = organIndexMonthData.stream().filter(e -> e.getOrganId() != null && e.getOrganId() != 0).collect(Collectors.toList());
 			if(!CollectionUtils.isEmpty(collect)){
@@ -336,19 +337,20 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 						organIds, TenantContextHolder.getTenantId(), Integer.class, String.class);
 				Function<Integer,IndexBaseMonthData> fun = (organId) -> new IndexBaseMonthData(organId,organMap.get(organId),indexDataType,
 						listMap.get(organId).stream().map(e->e.getPercent()).reduce(BigDecimal.ZERO,BigDecimal::add));
-				List<IndexBaseMonthData> dataList = organIds.stream().map(fun::apply).collect(Collectors.toList());
+				dataList = organIds.stream().map(fun::apply).collect(Collectors.toList());
 				if(!CollectionUtils.isEmpty(queryOrganIds)){
 					queryOrganIds.removeAll(organIds);
-					if(!CollectionUtils.isEmpty(queryOrganIds)){
-						Function<Integer,IndexBaseMonthData> fun1 = (organId) -> new IndexBaseMonthData(organId,organMap.get(organId),indexDataType,BigDecimal.ZERO);
-						dataList.addAll(queryOrganIds.stream().map(fun1::apply).collect(Collectors.toList()));
-					}
 				}
-				List<IndexBaseMonthData> baseMonthData = dataList.stream().sorted(Comparator.comparing(IndexBaseMonthData::getPercent,Comparator.reverseOrder())).collect(Collectors.toList());
-				return baseMonthData;
 			}
 		}
-		return new ArrayList<>();
+		if(!CollectionUtils.isEmpty(queryOrganIds)){
+			Map<Integer, String> organMap = organizationService.getMap("organization", "id_", "name_",
+					queryOrganIds, TenantContextHolder.getTenantId(), Integer.class, String.class);
+			Function<Integer,IndexBaseMonthData> fun1 = (organId) -> new IndexBaseMonthData(organId,organMap.get(organId),indexDataType,BigDecimal.ZERO);
+			dataList.addAll(queryOrganIds.stream().map(fun1::apply).collect(Collectors.toList()));
+		}
+		List<IndexBaseMonthData> baseMonthData = dataList.stream().sorted(Comparator.comparing(IndexBaseMonthData::getPercent,Comparator.reverseOrder())).collect(Collectors.toList());
+		return baseMonthData;
 	}
 
 	@Override