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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-26 19:22:30 +08:00
parent b8c95f30f5 d9a83fd41d
commit 2c082a9792
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
renren-admin/src/main/java/io/renren/modules/resourceMountApply/controller/TResourceMountApplyController.java
View File

@ -68,11 +68,13 @@ public class TResourceMountApplyController {
// @RequiresPermissions("resourceMountApply:tresourcemountapply:info")
public Result<TResourceMountApplyDTO> get(@PathVariable("id") Long id) {
TResourceMountApplyDTO data = tResourceMountApplyService.get(id);
SysDeptDTO sysDeptDTO = sysDeptService.get(Long.valueOf(data.getDeptId()));
if (sysDeptDTO != null) {
ResourceDTO resourceDTO = data.getResourceDTO();
resourceDTO.setDeptName(sysDeptDTO.getName());
data.setResourceDTO(resourceDTO);
if (data.getDeptId() != null) {
SysDeptDTO sysDeptDTO = sysDeptService.get(Long.valueOf(data.getDeptId()));
if (sysDeptDTO != null) {
ResourceDTO resourceDTO = data.getResourceDTO();
resourceDTO.setDeptName(sysDeptDTO.getName());
data.setResourceDTO(resourceDTO);
}
}
return new Result<TResourceMountApplyDTO>().ok(data);
}