diff --git a/ant-design-vue-jeecg/src/views/course/modules/SeCourseView.vue b/ant-design-vue-jeecg/src/views/course/modules/SeCourseView.vue
index b738f6c..7259397 100644
--- a/ant-design-vue-jeecg/src/views/course/modules/SeCourseView.vue
+++ b/ant-design-vue-jeecg/src/views/course/modules/SeCourseView.vue
@@ -101,10 +101,11 @@
(二)课程目标考核内容分布与评价方式
- 六、课程目标达成度评价方法
-
+
- 七、推荐教材、参考资料及其他
+
+ 六、推荐教材、参考资料及其他
(一)推荐教材
{{item.valueOf()}}
(二)参考资料
diff --git a/ant-design-vue-jeecg/src/views/py/PyBasicInfoList.vue b/ant-design-vue-jeecg/src/views/py/PyBasicInfoList.vue
index 6ad53e7..5053064 100644
--- a/ant-design-vue-jeecg/src/views/py/PyBasicInfoList.vue
+++ b/ant-design-vue-jeecg/src/views/py/PyBasicInfoList.vue
@@ -32,8 +32,8 @@
-
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cms/service/CmsHomeTrainingPlanServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cms/service/CmsHomeTrainingPlanServiceImpl.java
index a7b89a7..9212d4f 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cms/service/CmsHomeTrainingPlanServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cms/service/CmsHomeTrainingPlanServiceImpl.java
@@ -300,18 +300,16 @@ public class CmsHomeTrainingPlanServiceImpl implements ICmsHomeTrainingPlanServi
courseTotalCredit.updateAndGet(v1 -> v1 + kcXuefen);
//该课程目标对应的毕业要求(暂时只考虑一个课程目标对就一个毕业要求)
- SeCourseobjectives courseobjectives = seCourseobjectivesService.getById(knowcourse.getKcmbid());
- if (!ObjectUtils.isEmpty(courseobjectives)) {
+ SeCourseobjectives courseObjective = seCourseobjectivesService.getById(knowcourse.getKcmbid());
+ if (!ObjectUtils.isEmpty(courseObjective) && !StringUtils.isEmpty(courseObjective.getRequireid())) {
CourseObjectivesAndGraduationRequirementsVo vo = new CourseObjectivesAndGraduationRequirementsVo();
- if (!StringUtils.isEmpty(courseobjectives.getRequireid())) {
- String requireid = courseobjectives.getRequireid();
- vo.setRequireId(requireid);
- vo.setCourseId(seCourse.getId());
- vo.setCredit(kcXuefen);
- PyGraRequire pyGraRequire = pyGraRequireService.getById(requireid);
- vo.setRequirePid(pyGraRequire.getPid());
- voList.add(vo);
- }
+ String requireId = courseObjective.getRequireid();
+ vo.setRequireId(requireId);
+ vo.setCourseId(seCourse.getId());
+ vo.setCredit(kcXuefen);
+ PyGraRequire pyGraRequire = pyGraRequireService.getById(requireId);
+ vo.setRequirePid(pyGraRequire.getPid());
+ voList.add(vo);
}
});
log.info("课程:" + seCourse.getName() + ",总学分数:" + courseTotalCredit.get().intValue());