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

Merge branch 'dev' into docker_package

This commit is contained in:
wangliwen 2022-07-14 16:17:24 +08:00
parent 8cedffa8e7 56316a2ce2
commit 81e41c2449
1 changed files with 11 additions and 1 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

@ -10,9 +10,12 @@ import io.renren.common.validator.ValidatorUtils;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.DefaultGroup;
import io.renren.common.validator.group.UpdateGroup;
import io.renren.modules.resource.dto.ResourceDTO;
import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO;
import io.renren.modules.resourceMountApply.excel.TResourceMountApplyExcel;
import io.renren.modules.resourceMountApply.service.TResourceMountApplyService;
import io.renren.modules.sys.dto.SysDeptDTO;
import io.renren.modules.sys.service.SysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@ -39,6 +42,8 @@ import java.util.Map;
public class TResourceMountApplyController {
@Autowired
private TResourceMountApplyService tResourceMountApplyService;
@Autowired
private SysDeptService sysDeptService;
@GetMapping("/page")
@ApiOperation("分页")
@ -63,7 +68,12 @@ 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);
}
return new Result<TResourceMountApplyDTO>().ok(data);
}