From 06fdd0c6e0dfd83bf81244532e33e707fd041e03 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Fri, 30 Aug 2024 14:53:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E8=B5=9B=E9=98=9F=E5=91=98?= =?UTF-8?q?=E4=BD=8D=E6=AC=A1=E6=AF=94=E5=80=BC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/homepage/service/UserHomePageServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java index 72c22be9..040a7918 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java +++ b/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().eq(Annual::getAnnualName, currentYear + "")); - if(ObjectUtils.isEmpty(annual)) return resultMap; + if (ObjectUtils.isEmpty(annual)) return resultMap; List annualCompList = iAnnualCompService.list(new LambdaQueryWrapper() .eq(AnnualComp::getAnnualid, annual.getId())); @@ -638,7 +638,7 @@ public class UserHomePageServiceImpl implements UserHomePageService { String departId = sysDepart.getParentId(); //当前年度 Annual annual = iAnnualService.getOne(new LambdaQueryWrapper().eq(Annual::getAnnualName, currentYear + "")); - if(ObjectUtils.isEmpty(annual)) return resultMap; + if (ObjectUtils.isEmpty(annual)) return resultMap; List compList = iCompService.list(new LambdaQueryWrapper().eq(Comp::getCompOrgan, departId)); Set 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); } } }