diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java index 21e5a490..91549f70 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java @@ -16,7 +16,7 @@ public class CodeUtil { final String[] code = {""}; ISysCodeRuleService service = SpringContextHolder.getBean(ISysCodeRuleService.class); RedissonUtils.lock(() -> - code[0] = service.codeDemo("1",ruleCode), ruleCode, 2); + code[0] = service.codeDemo("1",ruleCode), ruleCode, 3); return code[0]; } public static String codeView(String ruleCode) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/MappingHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/MappingHandler.java index 61046e21..f39aeea9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/MappingHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/MappingHandler.java @@ -148,6 +148,17 @@ public class MappingHandler extends TypeHandler { } value = valueMap; } + if (valueStruc instanceof List){ + Object item = ((List) valueStruc).get(0); + Map valueMap = new HashMap<>(); + Map valueStrucMap = (Map) item; + for (String innerKey : valueStrucMap.keySet()) { + Object innerValueStruc = valueStrucMap.get(innerKey); + Object innerValue = this.velueMapping(sourceFormData, innerKey, innerValueStruc, formDataMapping); + valueMap.put(innerKey,innerValue); + } + value = ListOf.of(valueMap); + } return value; }