diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 7dafd814..85318152 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -766,6 +766,13 @@ public class ChangeRecordServiceImpl extends ServiceImpl taskOrders = req.getRelationOrderMap().getOrDefault(VisaBillTypeEnum.TASK.name(), null); if (CollectionUtils.isNotEmpty(taskOrders)) { + List> taskOrderMaps = new ArrayList<>(); + taskOrders.forEach(i -> { + Map taskOrderMap = new HashMap<>(); + taskOrderMap.put("id", i.getNo()); + taskOrderMap.put("name", i.getName()); + taskOrderMaps.add(taskOrderMap); + }); formVariables.put(FORM_FIELD_RELATION_TASK_ORDER, taskOrders); } @@ -776,14 +783,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl visaOrders = req.getRelationOrderMap().getOrDefault(VisaBillTypeEnum.DESIGN_VISA.name(), null); if (CollectionUtils.isNotEmpty(visaOrders)) { - List> visaOrderMaps = new ArrayList<>(); - visaOrders.forEach(i -> { - Map visaOrderMap = new HashMap<>(); - visaOrderMap.put("id", i.getNo()); - visaOrderMap.put("name", i.getName()); - visaOrderMaps.add(visaOrderMap); - }); - formVariables.put(FORM_FIELD_RELATION_VISA_ORDER, visaOrderMaps); + formVariables.put(FORM_FIELD_RELATION_VISA_ORDER, visaOrders); } } formVariables.put(FORM_FIELD_ATTACH, req.getAttach());