|
@@ -570,11 +570,15 @@ public class FsUserServiceImpl implements IFsUserService
|
|
|
|
|
|
List<SysDictData> courseProject = dictDataMapper.selectDictDataByType("sys_course_project");
|
|
|
for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOS) {
|
|
|
- // 项目
|
|
|
- courseProject.stream()
|
|
|
- .filter(c -> c.getDictValue().equals(fsUserPageListVO.getProjectId().toString()))
|
|
|
- .findFirst()
|
|
|
- .ifPresent(c -> fsUserPageListVO.setProjectName(c.getDictLabel()));
|
|
|
+ if (courseProject != null && !courseProject.isEmpty()) {
|
|
|
+ if (fsUserPageListVO.getProjectId() != null){
|
|
|
+ // 项目
|
|
|
+ courseProject.stream()
|
|
|
+ .filter(c -> c.getDictValue().equals(fsUserPageListVO.getProjectId().toString()))
|
|
|
+ .findFirst()
|
|
|
+ .ifPresent(c -> fsUserPageListVO.setProjectName(c.getDictLabel()));
|
|
|
+ }
|
|
|
+ }
|
|
|
if (StringUtils.isEmpty(fsUserPageListVO.getNickname())){
|
|
|
fsUserPageListVO.setNickname("用户暂未授权昵称");
|
|
|
}
|