From 8e5419df9cbcb7bf3f23df7708e1deac0d2459dc Mon Sep 17 00:00:00 2001 From: zwt13703 Date: Sat, 14 Mar 2026 15:50:33 +0800 Subject: [PATCH] feat:updates --- .../art/controller/ArtTestController.java | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtTestController.java b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtTestController.java index 9a9e1e6..8d6cf8f 100644 --- a/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtTestController.java +++ b/ruoyi-modules/ruoyi-art/src/main/java/org/dromara/art/controller/ArtTestController.java @@ -349,32 +349,39 @@ public class ArtTestController extends BaseController { //detail.setRemark("source=" + sourceTag); ArtSchoolCollegeBo schoolCollegeBo = null; - List schoolCollegeBoList = new ArrayList<>(); + List schoolCollegeBoList = null; ArtSchoolMajorBo artSchoolMajorBo = null; - List schoolMajorBoList; + List schoolMajorBoList = null; // 学院信息 - for (JsonNode college : node.get("college")) { - schoolCollegeBo = new ArtSchoolCollegeBo(); - schoolCollegeBo.setCollegeName(asText(college.get("collegeName"))); - schoolCollegeBo.setCollege51sdxId(asInteger(college.get("collegeId"))); + if (node.has("college")) { + JsonNode collegeNode = node.get("college"); + schoolCollegeBoList = new ArrayList<>(); + if (!collegeNode.isEmpty()) { + for (JsonNode college : collegeNode) { + schoolCollegeBo = new ArtSchoolCollegeBo(); + schoolCollegeBo.setCollegeName(asText(college.get("collegeName"))); + schoolCollegeBo.setCollege51sdxId(asInteger(college.get("collegeId"))); - schoolMajorBoList = new ArrayList<>(); - // 学院专业列表 - if (college.has("majorList")) { - for (JsonNode major : college.get("majorList")) { - artSchoolMajorBo = new ArtSchoolMajorBo(); - artSchoolMajorBo.setEducationLevel( - "(本)".equals(asText(major.get("majorLevel"))) ? "1" : "0" - ); - artSchoolMajorBo.setMajorName(asText(major.get("majorName"))); - artSchoolMajorBo.setMajor51sdxId(asText(major.get("majorId"))); - schoolMajorBoList.add(artSchoolMajorBo); - } - schoolCollegeBo.setSchoolMajorBoList(schoolMajorBoList); + schoolMajorBoList = new ArrayList<>(); + // 学院专业列表 + if (college.has("majorList")) { + for (JsonNode major : college.get("majorList")) { + artSchoolMajorBo = new ArtSchoolMajorBo(); + artSchoolMajorBo.setEducationLevel( + "(本)".equals(asText(major.get("majorLevel"))) ? "1" : "0" + ); + artSchoolMajorBo.setMajorName(asText(major.get("majorName"))); + artSchoolMajorBo.setMajor51sdxId(asText(major.get("majorId"))); + schoolMajorBoList.add(artSchoolMajorBo); + } + schoolCollegeBo.setSchoolMajorBoList(schoolMajorBoList); + } + schoolCollegeBoList.add(schoolCollegeBo); + } + } } - schoolCollegeBoList.add(schoolCollegeBo); - } + // 其余结构化内容已映射到详情 JSON 字段