Merge remote-tracking branch 'origin/master'

yn147

2023-05-10 96286178ee1c257c130cb2ad964a781f36c4eee5

 src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java

@@ -181,8 +181,8 @@
//                "culturalClassroomRes", chineseLanguageClassRes,
//                "culturalChinaRes", culturalChinaRes);
        return CollectionUtils.newObjectMap(
                "culturalClassroomRes",CollectionUtils.newObjectMap("subjectId",culturalChinaId.get(0),"data",chineseLanguageClassRes),
                "culturalChinaRes",CollectionUtils.newObjectMap("subjectId",chineseLanguageClassId.get(0),"data",culturalChinaRes)
                "culturalClassroomRes",CollectionUtils.newObjectMap("data",chineseLanguageClassRes),
                "culturalChinaRes",CollectionUtils.newObjectMap("data", culturalChinaRes)
        );
    }

@@ -221,15 +221,15 @@
                        .reversed()).map(SubjectLecture::getResItemId).limit(8).collect(toList());
        StringBuffer hqlRes = new StringBuffer("from Res p where deleteFlag is false and status=?");
        List<Res> resList = find(hqlRes.toString(), args, Res.class);
        ArrayList<Res> culturalChinaRes = new ArrayList<>();
        ArrayList<Res> culturalClassroomRes = new ArrayList<>();
        ArrayList<Res> chineseCourseRes = new ArrayList<>();
        ArrayList<Res> culturalClassroomRes = new ArrayList<>();//文化课堂
        ArrayList<Res> realClassRes = new ArrayList<>();

        if (culturalClassroomResId != null) {
            for (String resItemId : culturalClassroomResId) {
                for (Res res : resList) {
                    if (res.getResId().equals(resItemId)) {
                        culturalChinaRes.add(res);
                        culturalClassroomRes.add(res);
                    }
                }
            }
@@ -238,7 +238,7 @@
            for (String resItemId : realClassResId) {
                for (Res res : resList) {
                    if (res.getResId().equals(resItemId)) {
                        culturalClassroomRes.add(res);
                        realClassRes.add(res);
                    }
                }
            }
@@ -247,17 +247,16 @@
            for (String resItemId : chineseCourseResId) {
                for (Res res : resList) {
                    if (res.getResId().equals(resItemId)) {
                        realClassRes.add(res);
                        chineseCourseRes.add(res);
                    }
                }
            }
        }
        return CollectionUtils.newObjectMap(
                "culturalChinaRes",CollectionUtils.newObjectMap("subjectId",culturalClassroomId.size() == 0 ? null : culturalClassroomId.get(0),"data",culturalChinaRes),
                "chineseCourseRes",CollectionUtils.newObjectMap("subjectId",culturalClassroomId.size() == 0 ? null : culturalClassroomId.get(0),"data",chineseCourseRes),
                "culturalClassroomRes",CollectionUtils.newObjectMap("subjectId",realClassId.size() == 0 ? null : realClassId.get(0),"data",culturalClassroomRes),
                "realClassRes", CollectionUtils.newObjectMap("subjectId",chineseCourseId.size() == 0 ? null :chineseCourseId.get(0),"data",realClassRes));
    }


    /**
     * 获取首页标签