Merge branch 'bugfix-20230918' into 'developer'

内容数据转换修复

See merge request !1449

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MaterialDataAdaptor.java

@@ -91,7 +91,11 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return null;
         }
-        JSONObject jsonObject = DataApiUtils.getPageOne(result);
+        List<JSONObject> dataList = DataApiUtils.getDataList(result);
+        if (CollectionUtils.isEmpty(dataList)) {
+            return null;
+        }
+        JSONObject jsonObject = dataList.get(0);
         if (jsonObject.isEmpty()) {
             return null;
         }
@@ -136,7 +140,11 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return null;
         }
-        JSONObject jsonObject = DataApiUtils.getPageOne(result);
+        List<JSONObject> dataList = DataApiUtils.getDataList(result);
+        if (CollectionUtils.isEmpty(dataList)) {
+            return null;
+        }
+        JSONObject jsonObject = dataList.get(0);
         if (jsonObject.isEmpty()) {
             return null;
         }