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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhuchunyun 2024-08-28 17:56:43 +08:00
commit 32ff36ca08
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java
View File

@ -81,8 +81,12 @@ public class DriveSchoolCourseServiceImpl implements IDriveSchoolCourseService
IPage<DriveSchoolCourse> driveSchoolCourseIPage = driveSchoolCourseMapper.selectDriveSchoolCourseList(driveSchoolCourse, page);
List<DriveSchoolCourse> driveSchoolCourses = driveSchoolCourseIPage.getRecords();
for (DriveSchoolCourse driveSchoolCours : driveSchoolCourses) {
DriveSchoolInfo driveSchoolInfo = driveSchoolInfoMapper.getSchoolInfoByDeptId(driveSchoolCours.getDeptId());
driveSchoolCours.setPhone(driveSchoolInfo.getPhone());
// update by pqz 2024年8月28日 解决空指针
DriveSchoolInfo driveSchoolInfo = driveSchoolInfoMapper.getSchoolInfoByDeptId(driveSchoolCours.getDeptId() == null ? 100:driveSchoolCours.getDeptId());
// update by pqz 2024年8月28日 解决空指针
if (null != driveSchoolInfo){
driveSchoolCours.setPhone(driveSchoolInfo.getPhone());
}
}
if (ObjectUtils.isNotEmpty(driveSchoolCourse.getPayType()) && driveSchoolCourse.getPayType().equals("2")){
driveSchoolCourses.forEach(item ->{