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-12-09 10:19:42 +08:00
parent f622f3dedd 2d12110d7c
commit c09d461ffe
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
View File

@ -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()));