diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java index de7cc534ab6a26dd0d70e086c5c9ca619d259d4a..454bd2772fca3dc39eb2ccb6297bababf95dc533 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java @@ -245,15 +245,16 @@ public class ProcessTaskDraftGetApi extends PrivateApiComponentBase { */ private JSONObject getFromFormAttributeDataMap(Long fromProcessTaskId) { JSONObject resultObj = new JSONObject(); + Map labelUuidMap = new HashMap<>(); + Map labelHandlerMap = new HashMap<>(); + Map keyUuidMap = new HashMap<>(); + Map keyHandlerMap = new HashMap<>(); + Map formAttributeDataMap = new HashMap<>(); // 获取旧工单表单信息 ProcessTaskFormVo processTaskFormVo = processTaskMapper.getProcessTaskFormByProcessTaskId(fromProcessTaskId); if (processTaskFormVo != null && StringUtils.isNotBlank(processTaskFormVo.getFormContentHash())) { String formContent = selectContentByHashMapper.getProcessTaskFromContentByHash(processTaskFormVo.getFormContentHash()); if (StringUtils.isNotBlank(formContent)) { - Map labelUuidMap = new HashMap<>(); - Map labelHandlerMap = new HashMap<>(); - Map keyUuidMap = new HashMap<>(); - Map keyHandlerMap = new HashMap<>(); JSONObject formConfig = JSON.parseObject(formContent); FormVersionVo fromFormVersion = new FormVersionVo(); fromFormVersion.setFormConfig(formConfig); @@ -268,18 +269,17 @@ public class ProcessTaskDraftGetApi extends PrivateApiComponentBase { keyHandlerMap.put(formAttributeVo.getKey(), formAttributeVo.getHandler()); } } - Map formAttributeDataMap = new HashMap<>(); List processTaskFormAttributeDataList = processTaskService.getProcessTaskFormAttributeDataListByProcessTaskId(fromProcessTaskId); for (ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo : processTaskFormAttributeDataList) { formAttributeDataMap.put(processTaskFormAttributeDataVo.getAttributeUuid(), processTaskFormAttributeDataVo.getDataObj()); } - resultObj.put("labelUuidMap", labelUuidMap); - resultObj.put("labelHandlerMap", labelHandlerMap); - resultObj.put("keyUuidMap", keyUuidMap); - resultObj.put("keyHandlerMap", keyHandlerMap); - resultObj.put("formAttributeDataMap", formAttributeDataMap); } } + resultObj.put("labelUuidMap", labelUuidMap); + resultObj.put("labelHandlerMap", labelHandlerMap); + resultObj.put("keyUuidMap", keyUuidMap); + resultObj.put("keyHandlerMap", keyHandlerMap); + resultObj.put("formAttributeDataMap", formAttributeDataMap); return resultObj; }