|
@@ -87,10 +87,11 @@ public class JsonResourceUtil {
|
|
System.out.println(array);
|
|
System.out.println(array);
|
|
StringBuilder sb = new StringBuilder();
|
|
StringBuilder sb = new StringBuilder();
|
|
array.forEach(it -> {
|
|
array.forEach(it -> {
|
|
- if (mapMap.get(it.toString()).isEmpty()) {
|
|
|
|
|
|
+ String filedName = it.toString();
|
|
|
|
+ if (null== mapMap.get(filedName)||mapMap.get(filedName).isEmpty()) {
|
|
sb.append(it).append(",");
|
|
sb.append(it).append(",");
|
|
} else {
|
|
} else {
|
|
- sb.append(mapMap.get(it.toString()).get("filed")).append(",");
|
|
|
|
|
|
+ sb.append(mapMap.get(filedName).get("filed")).append(",");
|
|
}
|
|
}
|
|
});
|
|
});
|
|
return sb.deleteCharAt(sb.length() - 1).toString();
|
|
return sb.deleteCharAt(sb.length() - 1).toString();
|
|
@@ -102,7 +103,8 @@ public class JsonResourceUtil {
|
|
public static List<String> joinTitle(Map<String, Map<String,Object>> mapMap,JSONArray array) {
|
|
public static List<String> joinTitle(Map<String, Map<String,Object>> mapMap,JSONArray array) {
|
|
List<String> titles = new ArrayList<>(20);
|
|
List<String> titles = new ArrayList<>(20);
|
|
array.forEach(it -> {
|
|
array.forEach(it -> {
|
|
- if (mapMap.get(it.toString()).isEmpty()) {
|
|
|
|
|
|
+ String titleName = it.toString();
|
|
|
|
+ if (null== mapMap.get(titleName)||mapMap.get(titleName).isEmpty()) {
|
|
titles.add(it.toString());
|
|
titles.add(it.toString());
|
|
} else {
|
|
} else {
|
|
titles.add(mapMap.get(it.toString()).get("comment").toString());
|
|
titles.add(mapMap.get(it.toString()).get("comment").toString());
|