From db3ed347479af4b6f85034540ecedcd47bd2b9f4 Mon Sep 17 00:00:00 2001 From: PQZ Date: Fri, 30 Aug 2024 17:23:47 +0800 Subject: [PATCH] 1 --- .../jx/controller/admin/DriveSchoolCourseController.java | 6 ++++++ .../jx/controller/admin/DriveSchoolDynamicController.java | 6 ++++++ .../jx/controller/admin/DriveSchoolFeedbackController.java | 2 +- .../jx/controller/admin/DriveSchoolInfoController.java | 6 ++++++ .../admin/DriveSchoolReservationCourseController.java | 2 +- .../src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java index ecb40e25..08185c78 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java @@ -28,6 +28,12 @@ public class DriveSchoolCourseController extends BaseController @GetMapping("/list") public CommonResult> list(DriveSchoolCourse driveSchoolCourse) { + if(null == driveSchoolCourse.getPageNum()){ + driveSchoolCourse.setPageNum(1); + } + if (null == driveSchoolCourse.getPageSize()){ + driveSchoolCourse.setPageSize(100); + } Page page = new Page<>(driveSchoolCourse.getPageNum(), driveSchoolCourse.getPageSize()); IPage driveSchoolCourseIPage = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse, page); return CommonResult.success(driveSchoolCourseIPage); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java index 40d1db02..7b6de308 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java @@ -29,6 +29,12 @@ public class DriveSchoolDynamicController extends BaseController @GetMapping("/list") public CommonResult> list(DriveSchoolDynamic driveSchoolDynamic) { + if(null == driveSchoolDynamic.getPageNum()){ + driveSchoolDynamic.setPageNum(1); + } + if (null == driveSchoolDynamic.getPageSize()){ + driveSchoolDynamic.setPageSize(100); + } Page page = new Page<>(driveSchoolDynamic.getPageNum(), driveSchoolDynamic.getPageSize()); IPage driveSchoolDynamicIPage = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic, page); return CommonResult.success(driveSchoolDynamicIPage); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFeedbackController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFeedbackController.java index cd3754fd..337eb98b 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFeedbackController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolFeedbackController.java @@ -89,7 +89,7 @@ public class DriveSchoolFeedbackController extends BaseController /** * 删除反馈 */ - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public CommonResult remove(@PathVariable Long[] ids) { return toAjax(driveSchoolFeedbackService.deleteDriveSchoolFeedbackByIds(ids)); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java index b22a53a1..8df8f051 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java @@ -42,6 +42,12 @@ public class DriveSchoolInfoController extends BaseController @GetMapping("/list") public CommonResult> list(DriveSchoolInfo driveSchoolInfo) { + if(null == driveSchoolInfo.getPageNum()){ + driveSchoolInfo.setPageNum(1); + } + if (null == driveSchoolInfo.getPageSize()){ + driveSchoolInfo.setPageSize(100); + } Page page = new Page<>(driveSchoolInfo.getPageNum(), driveSchoolInfo.getPageSize()); IPage driveSchoolInfoIPage = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo, page); return CommonResult.success(driveSchoolInfoIPage); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java index a2c20fb7..ccda2308 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java @@ -203,7 +203,7 @@ public class DriveSchoolReservationCourseController extends BaseController public CommonResult getAppReservationCourseListByUserId(DriveSchoolReservationCourse driveSchoolReservationCourse) { return success(driveSchoolReservationCourseService.getAppReservationCourseListByUserId(driveSchoolReservationCourse)); - } + } /** * app获取首页预约记录上 diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml index bbc6f620..e9491ff7 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" deleted = 0 - and id = #{id} + and id = #{entity.id} and dept_id = #{entity.deptId} and school_name like concat('%', #{entity.schoolName}, '%') and leader_name like concat('%', #{entity.leaderName}, '%')