From 20e1449578ac0e558dc038e302001d3a6819ab2c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 18 Dec 2020 11:52:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
index c5a69c6..1cc83ee 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
@@ -32,6 +32,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
public class SysProjectServiceImpl implements SysProjectService {
@@ -239,6 +240,11 @@
}
@Override
+ public List<SysProject> getAll() {
+ return sysProjectDao.getSysProjectList(null).stream().filter(project->project.getProject()!=null).collect(Collectors.toList());
+ }
+
+ @Override
public List<SysProject> getSysProjectList(int first, int pageSize) {
Map<String, Object> params = new HashMap<>();
params.put("first", first);
--
Gitblit v1.9.2