From 29166bc750623bea12a367ba7c527facdb582235 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 13 七月 2021 17:12:28 +0800
Subject: [PATCH] 修改转移试剂，生成领用单
---
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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..e82e8a7 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
@@ -120,7 +120,8 @@
if (StringUtils.isNotBlank(createrUser)) {
SysUser sysUser = sysUserService.getSysUser(createrUser);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("createrUser", createrUser);
}
}
@@ -144,7 +145,8 @@
if (StringUtils.isNotBlank(createrUser)) {
SysUser sysUser = sysUserService.getSysUser(createrUser);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("createrUser", createrUser);
}
}
@@ -163,7 +165,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 +215,10 @@
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 4){
+ break;
+ }
+
if (userMap.get(valuesList.get(2)) == null) {
throw new Exception("课题负责人不存在");
}
@@ -241,7 +247,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