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-10-27 17:54:38 +08:00
parent 4dae621fbf 968b309a43
commit 8c037768b4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ public class TResourceMountApplyController {
// @RequiresPermissions("resourceMountApply:tresourcemountapply:info")
public Result<TResourceMountApplyDTO> get(@PathVariable("id") Long id) {
TResourceMountApplyDTO data = tResourceMountApplyService.get(id);
if (data.getDeptId() != null) {
if (data != null && data.getDeptId() != null) {
SysDeptDTO sysDeptDTO = sysDeptService.get(Long.valueOf(data.getDeptId()));
if (sysDeptDTO != null) {
ResourceDTO resourceDTO = data.getResourceDTO();