Skip to content

B
brandkbs2
Commit e2186da5 by shenjunjie
Options

Merge branch 'release' into 'master' 

Release

See merge request !339
parents faab1f38 26c9066d
Showing with 6 additions and 2 deletions
src/main/java/com/zhiwei/brandkbs2/service/impl/ProjectServiceImpl.java
...@@ -448,8 +448,12 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -448,8 +448,12 @@ public class ProjectServiceImpl implements ProjectService {
} else { } else {
lists = new ArrayList<>(); lists = new ArrayList<>();
user.getRoles().forEach(userRole -> { user.getRoles().forEach(userRole -> {
lists.add(projectDao.findOneById(userRole.getProjectId())); Project project = projectDao.findOneById(userRole.getProjectId());
roleExpired.put(userRole.getProjectId(), null == userRole.getExpiredTime() ? null : new Date(userRole.getExpiredTime())); // 项目可能被删除
if (null != project) {
lists.add(projectDao.findOneById(userRole.getProjectId()));
roleExpired.put(userRole.getProjectId(), null == userRole.getExpiredTime() ? null : new Date(userRole.getExpiredTime()));
}
}); });
} }
return lists.stream().filter(Project::isShow).map(project -> { return lists.stream().filter(Project::isShow).map(project -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment