From f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 26 一月 2021 18:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
index 64b6c81..0133124 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 {
@@ -240,7 +241,12 @@
@Override
public List<SysProject> getAll() {
- return sysProjectDao.getSysProjectList(null);
+ return sysProjectDao.selectDistinctProjects();
+ }
+
+ @Override
+ public Boolean isExistProject(String project) {
+ return sysProjectDao.selectByProject(project) > 0;
}
@Override
--
Gitblit v1.9.2