diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index b104d180f1..58cb6334dc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -675,10 +675,19 @@ public class BaseAccadjApplyService extends MybatisBaseService map = new HashMap<>(); + Map formVariables = bv.getFormVariables(); + if (formVariables == null) { + map.put("isAdj", i); + bv.setFormVariables(map); + } else { + formVariables.put("isAdj", i); + } if (baseAccadjApply.getAccadjTypeValue().equals("调入")) { String callOutOrgSid = baseAccadjApply.getCallOutOrgSid(); List purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); - Boolean i = false; + for (String s : purchaseSids) { BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s); String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); @@ -688,14 +697,7 @@ public class BaseAccadjApplyService extends MybatisBaseService map = new HashMap<>(); - Map formVariables = bv.getFormVariables(); - if (formVariables == null) { - map.put("isAdj", i); - bv.setFormVariables(map); - } else { - formVariables.put("isAdj", i); - } + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());