Merge remote-tracking branch 'origin/master'

李宇

2021-02-04 1afdf3622484b9a54c4cc4642e38bbf5c815884f

 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