From 8588c1aa0ca6ef8d5675213e3fb0639098899ea8 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 11:28:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectRxswinEOServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index a222d0adf..734dfc54d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -366,7 +366,9 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProjectRxswinEO::getProjectId,projectId); List rxswinEOList = this.list(wrapper); - List versionList = rxswinEOList.stream().map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList()); + List versionList = rxswinEOList.stream() + .filter(e->StringUtils.isNotBlank(e.getVersion())) + .map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList()); Collections.sort(versionList,(a,b)->{ return Integer.parseInt(a) - Integer.parseInt(b); }); From 283fb2e1309e8d674ed32eb42833122a06fad95c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 11:39:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectRxswinEOServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 734dfc54d..078e1f7c8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -138,6 +138,10 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getPageInfo(ProjectRxswinEO projectRxswinEO) { LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); + if(StringUtils.isBlank(projectRxswinEO.getProjectId())){ + return new ArrayList<>(); + } + wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme());