From ecc4e57b4f7c6ecfd6823704688ee786b3350b1f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 02 十二月 2024 11:06:13 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index 437749b..301d0d0 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -129,6 +129,29 @@
             return ResultUtil.runErr();
         }
     }
+    
+    @ResponseBody
+    @PostMapping("/base/course/queryCoursePackageType")
+    @ApiOperation(value = "获取课程类型列表", tags = {"APP-课程列表"})
+    @ApiImplicitParams({
+    })
+    public ResultUtil<List<BaseVo>> queryCoursePackageType1() {
+        try {
+            List<TCoursePackageType> coursePackageTypes = coursePackageTypeService.list(new QueryWrapper<TCoursePackageType>().eq("state", 1));
+            List<BaseVo> list = new ArrayList<>();
+            coursePackageTypes.forEach(c -> {
+                BaseVo baseVo = new BaseVo();
+                BeanUtils.copyProperties(c, baseVo);
+                list.add(baseVo);
+            });
+            return ResultUtil.success(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultUtil.runErr();
+        }
+    }
+    
+    
 
 
     @ResponseBody
@@ -436,10 +459,12 @@
     public List<String> queryPackageById(@RequestBody Integer coursePackageId) {
         ArrayList<String> strings = new ArrayList<>();
         TCoursePackage byId = coursePackageService.getById(coursePackageId);
+        if(null == byId){
+            return null;
+        }
         Integer coursePackageTypeId = byId.getCoursePackageTypeId();
         strings.add(coursePackageTypeService.getById(coursePackageTypeId).getName());
         strings.add(byId.getName());
-
         return strings;
 
     }

--
Gitblit v1.7.1