dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:254c983fdfeda4bae0e554d8698b44011be45f96
Branches Tags
dianliang:master
dianliang:repair
dianliang:dev
..
compare: dianliang:fd353a54d1527126b08e5fdc27740b03e13b5f6f
Branches Tags
dianliang:repair
dianliang:dev
dianliang:master

No commits in common. "254c983fdfeda4bae0e554d8698b44011be45f96" and "fd353a54d1527126b08e5fdc27740b03e13b5f6f" have entirely different histories.
254c983fdf ... fd353a54d1

6 changed files with 3 additions and 21 deletions
Show Stats Expand all files Collapse all files

6
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolCourseController.java
View File

@ -28,12 +28,6 @@ public class DriveSchoolCourseController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public CommonResult<IPage<?>> list(DriveSchoolCourse driveSchoolCourse) 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()); Page<DriveSchoolCourse> page = new Page<>(driveSchoolCourse.getPageNum(), driveSchoolCourse.getPageSize());
IPage<DriveSchoolCourse> driveSchoolCourseIPage = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse, page); IPage<DriveSchoolCourse> driveSchoolCourseIPage = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse, page);
return CommonResult.success(driveSchoolCourseIPage); return CommonResult.success(driveSchoolCourseIPage);

6
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolDynamicController.java
View File

@ -29,12 +29,6 @@ public class DriveSchoolDynamicController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public CommonResult<IPage<?>> list(DriveSchoolDynamic driveSchoolDynamic) 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()); Page<DriveSchoolDynamic> page = new Page<>(driveSchoolDynamic.getPageNum(), driveSchoolDynamic.getPageSize());
IPage<DriveSchoolDynamic> driveSchoolDynamicIPage = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic, page); IPage<DriveSchoolDynamic> driveSchoolDynamicIPage = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic, page);
return CommonResult.success(driveSchoolDynamicIPage); return CommonResult.success(driveSchoolDynamicIPage);

6
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolInfoController.java
View File

@ -42,12 +42,6 @@ public class DriveSchoolInfoController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public CommonResult<IPage<?>> list(DriveSchoolInfo driveSchoolInfo) 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()); Page<DriveSchoolInfo> page = new Page<>(driveSchoolInfo.getPageNum(), driveSchoolInfo.getPageSize());
IPage<DriveSchoolInfo> driveSchoolInfoIPage = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo, page); IPage<DriveSchoolInfo> driveSchoolInfoIPage = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo, page);
return CommonResult.success(driveSchoolInfoIPage); return CommonResult.success(driveSchoolInfoIPage);

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

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