From 529173267b4e7b4b296e92a8c8705e0da5180c89 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 18:08:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java | 2 +-
1 files changed, 1 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 0133124..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();
--
Gitblit v1.9.2