Merge remote-tracking branch 'origin/zcc'

This commit is contained in:
wangjinlei
2024-06-03 13:48:17 +08:00

View File

@@ -27,6 +27,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.selectAs(CourseToMedicine::getSelective,"selective");
wrapper.leftJoin(CourseToMedicine.class, CourseToMedicine::getCourseId,CourseEntity::getId);
wrapper.eq(CourseToMedicine::getMedicalId,param.getId());
wrapper.orderByAsc(CourseToMedicine::getSort);
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper);
return courseEntityPage;
}
@@ -37,6 +38,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.selectAll(CourseEntity.class);
wrapper.leftJoin(CourseToMedicineMarketEntity.class, CourseToMedicineMarketEntity::getCourseId,CourseEntity::getId);
wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,param.getId());
wrapper.orderByAsc(CourseToMedicineMarketEntity::getSort);
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
return courseEntityPage;
}