Merge remote-tracking branch 'origin/yufei' into yufei

gdg

2021-01-29 d7427ab305dc17af447f5832903691eee329850c

 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();