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

gdg

2021-01-18 3ec412f3cdc8b114cf629e866a7b7b80687a3442

 src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java

@@ -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