Ver código fonte

teacher启动报错

weifanli 2 anos atrás
pai
commit
56ae904716

+ 1 - 0
.gitignore

@@ -53,3 +53,4 @@ target
 *.classpath
 /bin/
 **/bootstrap-local.yml
+**/bootstrap-local.properties

+ 2 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/PageUtil.java

@@ -35,10 +35,10 @@ public class PageUtil {
      */
     public static <T> IPage<T> getPage(QueryInfo query) {
         Page<T> page = new Page<T>(toInt(query.getPage(),1), toInt(query.getRows(),10));
-        if(ASC.equals(query.getOrder())){
+        if(ASC.equals(query.getOrder()) && !StringUtil.isEmpty(query.getSort())){
             page.setAsc(StringUtil.toStrArray(SqlKeyword.filter(query.getOrder())));
         }
-        if(DESC.equals(query.getOrder())){
+        if(DESC.equals(query.getOrder()) && !StringUtil.isEmpty(query.getSort())){
             page.setDesc(StringUtil.toStrArray(SqlKeyword.filter(query.getOrder())));
         }
         return page;

+ 2 - 2
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/CourseGroupController.java

@@ -49,14 +49,14 @@ public class CourseGroupController extends BaseController {
     }
 
     @ApiOperation("创建直播课程组-新增课程组")
-    @PostMapping("/lockCourseTime")
+    @PostMapping("/addLiveCourse")
     public HttpResponseResult<Object> addLiveCourse(@RequestBody LiveCourseGroupDto dto) {
         courseGroupService.addLiveCourse(dto);
         return succeed();
     }
 
     @ApiOperation("创建直播课程组-锁定课程时间-将课时写到缓存当作锁定的时间")
-    @PostMapping("/lockCourseTime")
+    @PostMapping("/lockCourseToCache")
     public HttpResponseResult<List<CourseTimeEntity>> lockCourseToCache(@RequestBody CheckLiveCourseTimeDto dto) {
         return succeed(courseGroupService.lockCourseToCache(dto));
     }