root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:修改同步时List类型维护

Browse Source
This commit is contained in:
zhangzq
2024-11-28 16:18:25 +08:00
parent 3ff8ee6520
commit 930fe95f04
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java
View File

@@ -16,7 +16,7 @@ public class CodeUtil {
final String[] code = {""}; final String[] code = {""};
ISysCodeRuleService service = SpringContextHolder.getBean(ISysCodeRuleService.class); ISysCodeRuleService service = SpringContextHolder.getBean(ISysCodeRuleService.class);
RedissonUtils.lock(() -> RedissonUtils.lock(() ->
code[0] = service.codeDemo("1",ruleCode), ruleCode, 2); code[0] = service.codeDemo("1",ruleCode), ruleCode, 3);
return code[0]; return code[0];
} }
public static String codeView(String ruleCode) { public static String codeView(String ruleCode) {

11
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/MappingHandler.java
View File

@@ -148,6 +148,17 @@ public class MappingHandler extends TypeHandler<JSONObject, JSONObject> {
} }
value = valueMap; value = valueMap;
} }
if (valueStruc instanceof List){
Object item = ((List<?>) valueStruc).get(0);
Map<String, Object> valueMap = new HashMap<>();
Map<String,Object> 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; return value;
} }