...
This commit is contained in:
parent
248f4aecb7
commit
ee641f3008
|
@ -271,6 +271,13 @@ public class ActHistoryService {
|
||||||
&& resourceMountApplyDTO.getResourceDTO().getId() != null) {
|
&& resourceMountApplyDTO.getResourceDTO().getId() != null) {
|
||||||
dto.setName(resourceMountApplyDTO.getResourceDTO().getName());
|
dto.setName(resourceMountApplyDTO.getResourceDTO().getName());
|
||||||
dto.setResourceId(resourceMountApplyDTO.getResourceDTO().getId().toString());
|
dto.setResourceId(resourceMountApplyDTO.getResourceDTO().getId().toString());
|
||||||
|
if (resourceMountApplyDTO.getResourceId() != null) {
|
||||||
|
ResourceDTO resourceDTO = resourceService.get(resourceMountApplyDTO.getResourceId());
|
||||||
|
if (resourceDTO != null) {
|
||||||
|
dto.setName(resourceDTO.getName());
|
||||||
|
dto.setResourceId(resourceDTO.getId().toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
ResourceDTO resourceDTO = resourceService.get(Long.valueOf(dto.getBusinessKey()));
|
ResourceDTO resourceDTO = resourceService.get(Long.valueOf(dto.getBusinessKey()));
|
||||||
if (resourceDTO != null) {
|
if (resourceDTO != null) {
|
||||||
|
|
Loading…
Reference in New Issue