Commit a8317f87 by guojx

Merge branch 'feature-2023-01-目标配置' into 'developer'

目标跟进接口修复

See merge request !921
parents 58d5ad73 d0e26ada
...@@ -89,12 +89,12 @@ public class TargetController { ...@@ -89,12 +89,12 @@ public class TargetController {
} }
result1.putAll(result2); result1.putAll(result2);
List<String> keyList = TargetAnalysisUtils.map.get(1); List<String> keyList = TargetAnalysisUtils.map.get("1");
keyList.addAll(TargetAnalysisUtils.map.get(0)); keyList.addAll(TargetAnalysisUtils.map.get("0"));
keyList.addAll(TargetAnalysisUtils.map.get(2)); keyList.addAll(TargetAnalysisUtils.map.get("2"));
keyList.addAll(TargetAnalysisUtils.map.get(3)); keyList.addAll(TargetAnalysisUtils.map.get("3"));
keyList.addAll(TargetAnalysisUtils.map.get(4)); keyList.addAll(TargetAnalysisUtils.map.get("4"));
keyList.addAll(TargetAnalysisUtils.map.get(5)); keyList.addAll(TargetAnalysisUtils.map.get("5"));
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
for (String key : keyList) { for (String key : keyList) {
result.put(key, result1.get(key)); result.put(key, result1.get(key));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment