wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-05 12:48:21 +08:00
parent da785822e0 1047569a77
commit 0d50ad1e4b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
View File

@ -133,7 +133,8 @@ public class ResourceController {
page.getList().forEach(item -> {
item.setInfoList(resourceService.selectAttrsByResourceId(item.getId()));
if (item.getDeptId() != null) {
String deptName = sysDeptService.get(item.getDeptId()) == null ? null : sysDeptService.get(item.getDeptId()).getName();
SysDeptDTO deptDTO = sysDeptService.get(item.getDeptId());
String deptName = deptDTO == null ? null : deptDTO.getName();
item.setDeptName(StringUtils.isNotBlank(deptName) ? deptName : "--");
}
});