From 422622d3121acde709e79ca9b92f30c47e05272c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期日, 07 二月 2021 14:38:12 +0800
Subject: [PATCH] 修改枪领用

---
 src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 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 c5a69c6..dd9d421 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 {
@@ -162,7 +163,7 @@
     @Transactional
     public void importProject(FileUploadEvent event,SysUser currentUser) throws Exception {
 
-        List<SysUser> userList = sysUserService.getSysUserList(null, null, null, null, null);
+        List<SysUser> userList = sysUserService.getSysUserList(null, null, null, null, null,null,null);
         List<SysProject> sysProjectList = sysProjectDao.getSysProjectList(new HashMap());
         Map<String,String> userMap = new HashMap();
         Map<String,String> projectMap = new HashMap();
@@ -239,6 +240,16 @@
     }
 
     @Override
+    public List<SysProject> getAll() {
+         return sysProjectDao.selectDistinctProjects();
+    }
+
+    @Override
+    public Boolean isExistProject(String project) {
+        return sysProjectDao.selectByProject(project) > 0;
+    }
+
+    @Override
     public List<SysProject> getSysProjectList(int first, int pageSize) {
         Map<String, Object> params = new HashMap<>();
         params.put("first", first);

--
Gitblit v1.9.2