Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system

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<IPage<?>> list(DriveSchoolCourse driveSchoolCourse)
     {
+        if(null == driveSchoolCourse.getPageNum()){
+            driveSchoolCourse.setPageNum(1);
+        }
+        if (null == driveSchoolCourse.getPageSize()){
+            driveSchoolCourse.setPageSize(100);
+        }
         Page<DriveSchoolCourse> page = new Page<>(driveSchoolCourse.getPageNum(), driveSchoolCourse.getPageSize());
         IPage<DriveSchoolCourse> driveSchoolCourseIPage = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse, page);
         return CommonResult.success(driveSchoolCourseIPage);

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<IPage<?>> list(DriveSchoolDynamic driveSchoolDynamic)
     {
+        if(null == driveSchoolDynamic.getPageNum()){
+            driveSchoolDynamic.setPageNum(1);
+        }
+        if (null == driveSchoolDynamic.getPageSize()){
+            driveSchoolDynamic.setPageSize(100);
+        }
         Page<DriveSchoolDynamic> page = new Page<>(driveSchoolDynamic.getPageNum(), driveSchoolDynamic.getPageSize());
             IPage<DriveSchoolDynamic> driveSchoolDynamicIPage = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic, page);
             return CommonResult.success(driveSchoolDynamicIPage);

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));

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<IPage<?>> list(DriveSchoolInfo driveSchoolInfo)
     {
+        if(null == driveSchoolInfo.getPageNum()){
+            driveSchoolInfo.setPageNum(1);
+        }
+        if (null == driveSchoolInfo.getPageSize()){
+            driveSchoolInfo.setPageSize(100);
+        }
         Page<DriveSchoolInfo> page = new Page<>(driveSchoolInfo.getPageNum(), driveSchoolInfo.getPageSize());
         IPage<DriveSchoolInfo> driveSchoolInfoIPage = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo, page);
         return CommonResult.success(driveSchoolInfoIPage);

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获取首页预约记录上

dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDriveSchoolInfoVo"/>
         <where>
             deleted = 0
-            <if test="id != null "> and id = #{id}</if>
+            <if test="entity.id != null "> and id = #{entity.id}</if>
             <if test="entity.deptId != null "> and dept_id = #{entity.deptId}</if>
             <if test="entity.schoolName != null  and entity.schoolName != ''"> and school_name like concat('%', #{entity.schoolName}, '%')</if>
             <if test="entity.leaderName != null  and entity.leaderName != ''"> and leader_name like concat('%', #{entity.leaderName}, '%')</if>