Merge branch 'dev'
This commit is contained in:
commit
2d12110d7c
|
@ -210,7 +210,9 @@ public class HistoryController {
|
|||
TResourceMountApplyDTO tResourceMountApplyDTO = null;
|
||||
TDemandDataDTO tDemandDataDTO = null;
|
||||
ResourceDTO resourceDTO = null;
|
||||
if (!activityDTO.getBusinessKey().startsWith("[") && !activityDTO.getBusinessKey().startsWith("{")) { // json 内容(批量申请)
|
||||
if (StringUtils.isNotEmpty(activityDTO.getBusinessKey())
|
||||
&& !activityDTO.getBusinessKey().startsWith("[")
|
||||
&& !activityDTO.getBusinessKey().startsWith("{")) { // json 内容(批量申请)
|
||||
tResourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(activityDTO.getBusinessKey()));
|
||||
tDemandDataDTO = tDemandDataService.get(Long.valueOf(activityDTO.getBusinessKey()));
|
||||
resourceDTO = resourceService.get(Long.valueOf(activityDTO.getBusinessKey()));
|
||||
|
|
Loading…
Reference in New Issue