From 7d7d2dc3095fa21b40fab71f107f87dea48ea075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sun, 28 Apr 2024 16:21:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=85=AC=E5=BC=8F=E6=95=B0?= =?UTF-8?q?=E7=BB=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/impl/FormulaRunServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java index 40edf009b..2b76af128 100644 --- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java +++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java @@ -91,7 +91,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService String datasourceJson = map.getOrDefault("datasource", ""); if (StringUtils.isNotBlank(datasourceJson)) { Map datasourceIdMap = JsonUtil.parseMap(datasourceJson, String.class); - String datasourceIdNode = datasourceIdMap.getOrDefault("datasourceId",""); + String datasourceIdNode = datasourceIdMap.getOrDefault("datasourceId", ""); if (StringUtils.isNotBlank(datasourceIdNode)) { datasourceId = datasourceIdNode; } @@ -216,6 +216,10 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService } if (DataType.NUMBER.equals(v.getFieldType()) && NumberUtils.isCreatable(v.getContent())) { context.put(v.getFieldId(), new BigDecimal(v.getContent())); + } else if (v.getContent().startsWith("[") && v.getContent().endsWith("]")) { + String content = v.getContent().substring(1); + content = content.substring(0, content.length() - 1); + context.put(v.getFieldId(), content.split(",")); } else { context.put(v.getFieldId(), v.getContent()); }