Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 1cf6133619607e51a0e4766694eafe6b369a2dab
+  newTag: f99682482437ce8160be9aabbc451816b58a860f

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

@@ -138,7 +138,7 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
 
     @Override
     public ResultBody curriculumDetails(Integer id) {
-        CurriculumInfoDO curriculumInfoDO = flyerTrainingDao.curriculumDetails(id);
+        CurriculumInfoDO curriculumInfoDO = flyerTrainingDao.selectCurriculumInfoById(id);
         if (curriculumInfoDO == null) {
             return ResultBody.error("课程不存在或已下架！");
         } else {

release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml

@@ -288,7 +288,7 @@
         where is_deleted = 0
     </select>
     <select id="selectCurriculumInfoById" resultType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
-        select * from curriculum_info where id = #{id}
+        select * from curriculum_info where id = #{id} and is_deleted = 0
     </select>
     <select id="selectCurriculumClassifyById"
             resultType="com.mmc.csf.release.entity.curriculum.CurriculumClassifyDO">