团队赛队员位次比值配置

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

@@ -376,7 +376,7 @@ public class UserHomePageServiceImpl implements UserHomePageService {
         if (recreateFlag) {
             //年度
             Annual annual = iAnnualService.getOne(new LambdaQueryWrapper<Annual>().eq(Annual::getAnnualName, currentYear + ""));
-            if(ObjectUtils.isEmpty(annual)) return resultMap;
+            if (ObjectUtils.isEmpty(annual)) return resultMap;
             List<AnnualComp> annualCompList = iAnnualCompService.list(new LambdaQueryWrapper<AnnualComp>()
                     .eq(AnnualComp::getAnnualid, annual.getId()));
 
@@ -638,7 +638,7 @@ public class UserHomePageServiceImpl implements UserHomePageService {
             String departId = sysDepart.getParentId();
             //当前年度
             Annual annual = iAnnualService.getOne(new LambdaQueryWrapper<Annual>().eq(Annual::getAnnualName, currentYear + ""));
-            if(ObjectUtils.isEmpty(annual)) return resultMap;
+            if (ObjectUtils.isEmpty(annual)) return resultMap;
 
             List<Comp> compList = iCompService.list(new LambdaQueryWrapper<Comp>().eq(Comp::getCompOrgan, departId));
             Set<String> compIds = Optional.ofNullable(compList).orElse(new LinkedList<>()).stream().map(obj -> obj.getId()).collect(Collectors.toSet());
@@ -825,7 +825,7 @@ public class UserHomePageServiceImpl implements UserHomePageService {
             if (hasKey) {
                 return redisUtil.get(REPORT4DEPART);
             } else {
-                return this.report4Depart(orgCode, yearStr, true);
+                return this.report4Depart(yearStr, orgCode, true);
             }
         }
     }