From fcdb56cf78b63f5b1455bbfab0c2bd7934b0aca5 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 07 四月 2021 18:18:14 +0800
Subject: [PATCH] 去除多余事务

---
 src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
index 1cc83ee..806cfef 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
@@ -163,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();
@@ -213,6 +213,10 @@
                 valuesList.add(cellInfo);
             }
 
+            if (valuesList.size() != 4){
+                break;
+            }
+
             if (userMap.get(valuesList.get(2)) == null) {
                 throw new Exception("课题负责人不存在");
             }
@@ -241,7 +245,12 @@
 
     @Override
     public List<SysProject> getAll() {
-         return sysProjectDao.getSysProjectList(null).stream().filter(project->project.getProject()!=null).collect(Collectors.toList());
+         return sysProjectDao.selectDistinctProjects();
+    }
+
+    @Override
+    public Boolean isExistProject(String project) {
+        return sysProjectDao.selectByProject(project) > 0;
     }
 
     @Override

--
Gitblit v1.9.2