|
@@ -79,14 +79,13 @@ public class JsonResourceUtil {
|
|
return mapMap;
|
|
return mapMap;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 拼接字段
|
|
* 拼接字段
|
|
*/
|
|
*/
|
|
public static String joinFiled(Map<String, Map<String, Object>> mapMap, JSONArray array) {
|
|
public static String joinFiled(Map<String, Map<String, Object>> mapMap, JSONArray array) {
|
|
StringBuilder sb = new StringBuilder();
|
|
StringBuilder sb = new StringBuilder();
|
|
array.forEach(it -> {
|
|
array.forEach(it -> {
|
|
- if (mapMap.get(it) == null) {
|
|
|
|
|
|
+ if (mapMap.get(String.valueOf(it)).isEmpty()) {
|
|
sb.append(it).append(",");
|
|
sb.append(it).append(",");
|
|
} else {
|
|
} else {
|
|
sb.append(mapMap.get(it.toString()).get("filed")).append(",");
|
|
sb.append(mapMap.get(it.toString()).get("filed")).append(",");
|
|
@@ -101,8 +100,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) == null) {
|
|
|
|
- titles.add("");
|
|
|
|
|
|
+ if (mapMap.get(String.valueOf(it)).isEmpty()) {
|
|
|
|
+ titles.add(String.valueOf(it));
|
|
} else {
|
|
} else {
|
|
titles.add(mapMap.get(it.toString()).get("comment").toString());
|
|
titles.add(mapMap.get(it.toString()).get("comment").toString());
|
|
}
|
|
}
|