From c283e923f4525062c208575328e1713c86e5061d Mon Sep 17 00:00:00 2001
From: "hechao.zhu" <hechao.zhu@seaboxdata.com>
Date: Tue, 26 Sep 2023 18:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96&=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=209.26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/course/modules/SeCourseView.vue |  7 ++++---
 .../src/views/py/PyBasicInfoList.vue          |  6 +++---
 .../CmsHomeTrainingPlanServiceImpl.java       | 20 +++++++++----------
 3 files changed, 16 insertions(+), 17 deletions(-)

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 @@
             <p v-html="course.assessmentrules"></p>
             <p>（二）课程目标考核内容分布与评价方式</p>
             <p v-html="course.contentdistribution"></p>
-            <h3 style="margin-top:20px">六、课程目标达成度评价方法</h3>
-            <p v-html="course.achievement"></p>
+           <!-- <h3 style="margin-top:20px">六、课程目标达成度评价方法</h3>
+            <p v-html="course.achievement"></p>-->
 
-            <h3 style="margin-top:20px">七、推荐教材、参考资料及其他</h3>
+<!--            <h3 style="margin-top:20px">六、推荐教材、参考资料及其他</h3>-->
+            <h3 style="margin-top:20px">六、推荐教材、参考资料及其他</h3>
             <p>（一）推荐教材</p>
             <p v-for="(item,index) in bookcks"  style="font-weight: bold;margin-bottom: 0">{{item.valueOf()}}</p>
             <p>（二）参考资料</p>
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 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'py:edit'">新增</a-button>
+<!--    <div class="table-operator">-->
+<!--      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'py:edit'">新增</a-button>-->
       <!--      <a-button type="primary" icon="download" v-has="'py:edit'" @click="handleExportXls('培养方法')">导出</a-button>
       <a-upload
         name="file"
@@ -45,7 +45,7 @@
       >
         <a-button type="primary" v-has="'py:edit'" icon="import">导入</a-button>
       </a-upload>-->
-    </div>
+<!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
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());