团队赛队员位次比值配置

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java

@@ -387,9 +387,10 @@ public class UserHomePageServiceImpl implements UserHomePageService {
 
             Set<String> compIds = Optional.ofNullable(annualCompList).orElse(new LinkedList<>()).stream().map(obj -> obj.getId()).collect(Collectors.toSet());
             List<AnnualCompPoint> annualCompPointList = iAnnualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>().in(!ObjectUtils.isEmpty(compIds), AnnualCompPoint::getAnnualCompId, compIds));
+            if(ObjectUtil.isEmpty(annualCompPointList)) return resultMap;
             //当前年，所有项目id
             Set<String> annualCompPointIds = Optional.ofNullable(annualCompPointList).orElse(new ArrayList<>()).stream().map(annualCompPoint -> annualCompPoint.getId()).collect(Collectors.toSet());
-
+            if(ObjectUtil.isEmpty(annualCompPointIds)) return resultMap;
             //未评奖的项目为进行中
             List<AnnualCompPoint> pj0PointList = Optional.ofNullable(annualCompPointList).orElse(new LinkedList<>()).stream().filter(bo -> "0".equals(bo.getIsPj())).collect(Collectors.toList());
             Map<String, Object> countMap = this.convertProjectLevel(annualCompPointList);
@@ -658,10 +659,13 @@ public class UserHomePageServiceImpl implements UserHomePageService {
                     .in(!ObjectUtils.isEmpty(compIds), AnnualComp::getCompid, compIds));
 
             Set<String> annualCompIds = Optional.ofNullable(annualCompList).orElse(new LinkedList<>()).stream().map(obj -> obj.getId()).collect(Collectors.toSet());
+            if(ObjectUtil.isEmpty(annualCompIds)) return resultMap;
             List<AnnualCompPoint> annualCompPointList = iAnnualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>().in(AnnualCompPoint::getAnnualCompId, annualCompIds));
+            if(ObjectUtil.isEmpty(annualCompPointList)) return resultMap;
+
             //该部门，当前年，所有项目id
             Set<String> annualCompPointIds = Optional.ofNullable(annualCompPointList).orElse(new ArrayList<>()).stream().map(annualCompPoint -> annualCompPoint.getId()).collect(Collectors.toSet());
-
+            if(ObjectUtil.isEmpty(annualCompPointIds)) return resultMap;
             //未评奖的项目为进行中
             List<AnnualCompPoint> pj0PointList = Optional.ofNullable(annualCompPointList).orElse(new LinkedList<>()).stream().filter(bo -> "0".equals(bo.getIsPj())).collect(Collectors.toList());
             Map<String, Object> countMap = this.convertProjectLevel(annualCompPointList);