浏览代码

修改测试bug

songyh 3 年之前
父节点
当前提交
b1cbffb18b
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      jeecg-boot-module-system/src/main/java/org/jeecg/common/utils/JsonResourceUtil.java

+ 5 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/common/utils/JsonResourceUtil.java

@@ -87,10 +87,11 @@ public class JsonResourceUtil {
         System.out.println(array);
         StringBuilder sb = new StringBuilder();
         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(",");
             } 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();
@@ -102,7 +103,8 @@ public class JsonResourceUtil {
     public static List<String> joinTitle(Map<String, Map<String,Object>> mapMap,JSONArray array) {
         List<String> titles = new ArrayList<>(20);
         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());
             } else {
                 titles.add(mapMap.get(it.toString()).get("comment").toString());