From d339f7f3a50fe4bf5f8e48e932472ebada852e86 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 14:14:47 +0800
Subject: [PATCH] 备货领取 订单取消保存
---
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java | 9 +++++++--
1 files changed, 7 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..dd9d421 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();
@@ -241,7 +241,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