From 216aade17a74ec1eaeb240fac9468b249b6c8035 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 17 Aug 2021 16:46:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A5=E5=8E=86=E5=B0=8F?= =?UTF-8?q?=E7=BA=A2=E7=82=B9-=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/signin/service/ProjectService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/signin/src/main/java/com/ccsens/signin/service/ProjectService.java b/signin/src/main/java/com/ccsens/signin/service/ProjectService.java index dd89256e..9247054e 100644 --- a/signin/src/main/java/com/ccsens/signin/service/ProjectService.java +++ b/signin/src/main/java/com/ccsens/signin/service/ProjectService.java @@ -122,7 +122,7 @@ public class ProjectService implements IProjectService{ //查询项目列表 List projectList = projectDao.queryProjectList(param.getStartTime(), param.getEndTime(), userId); //获取项目的时间范围 - if (ObjectUtil.isNotNull(projectList)) { + if (CollectionUtil.isNotEmpty(projectList)) { List projectStartTimeList = projectList.stream().map(ProjectVo.QueryProject::getStartTime).collect(Collectors.toList()); List projectEndTimeList = projectList.stream().map(ProjectVo.QueryProject::getEndTime).collect(Collectors.toList()); Long maxStartTime = Collections.min(projectStartTimeList); @@ -155,9 +155,11 @@ public class ProjectService implements IProjectService{ //比较参数时间与项目时间 for (int i = 0; i < dateList.size(); i++) { haveProject.add("0"); - for (int y = 0; y < realDateList.size(); y++) { - if (dateList.get(i).equals(realDateList.get(y))){ - haveProject.set(i,"1"); + if (CollectionUtil.isNotEmpty(projectList)) { + for (String realDate : realDateList) { + if (dateList.get(i).equals(realDate)) { + haveProject.set(i, "1"); + } } } }