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..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<ProjectRxswinEOMappe
 	@Override
 	public List<ProjectRxswinEO> getPageInfo(ProjectRxswinEO projectRxswinEO) {
 		LambdaQueryWrapper<ProjectRxswinEO> 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());
@@ -366,7 +370,9 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
 		LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(ProjectRxswinEO::getProjectId,projectId);
 		List<ProjectRxswinEO> rxswinEOList = this.list(wrapper);
-		List<String> versionList = rxswinEOList.stream().map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList());
+		List<String> 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);
 		});