Merge pull request #1825 from KANLON/dev-fixParseSchemaColumnName

修复view 中解析配置的schema，columns -》 name的问题
running-elephant · Aug 8, 2022 · 0355dda · 0355dda
2 parents fe2ab10 + d3966ea
commit 0355dda
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/server/src/main/java/datart/server/service/impl/DataProviderServiceImpl.java b/server/src/main/java/datart/server/service/impl/DataProviderServiceImpl.java
@@ -440,13 +440,9 @@ private Map<String, Column> parseSchema(String model) {
                 jsonObject = jsonObject.getJSONObject("columns");
                 for (String key : jsonObject.keySet()) {
                     JSONObject item = jsonObject.getJSONObject(key);
-                    String nameString = item.getJSONArray("name").getString(0);
-                    String[] names;
-                    try {
-                        names = JSONObject.parseArray(nameString).toArray(new String[0]);
-                    } catch (JSONException e) {
-                        names = new String[]{nameString};
-                    }
+                    String[] names = item.get("name") instanceof JSONArray
+                            ? item.getJSONArray("name").stream().toArray(String[]::new)
+                            : new String[]{item.get("name").toString()};
                     Column column = Column.of(ValueType.valueOf(item.getString("type")), names);
                     schema.put(column.columnKey(), column);
                 }