|
|
@@ -33,8 +33,15 @@ public interface CourseTypeMapper extends BaseMapperX<CourseTypeDO> {
|
|
|
|
|
|
private static LambdaQueryWrapperX<CourseTypeDO> getCourseTypeDOLambdaQueryWrapperX(CourseTypeListReqVO reqVO) {
|
|
|
LambdaQueryWrapperX<CourseTypeDO> queryWrapper = new LambdaQueryWrapperX<CourseTypeDO>()
|
|
|
- .likeIfPresent(CourseTypeDO::getCtType, reqVO.getCtType())
|
|
|
- .eqIfPresent(CourseTypeDO::getCtParentId, reqVO.getCtParentId());
|
|
|
+ .likeIfPresent(CourseTypeDO::getCtType, reqVO.getCtType());
|
|
|
+
|
|
|
+ if (reqVO.getCtParentId() != null) {
|
|
|
+ queryWrapper.and(wrapper -> wrapper
|
|
|
+ .eq(CourseTypeDO::getCtParentId, reqVO.getCtParentId())
|
|
|
+ .or()
|
|
|
+ .eq(CourseTypeDO::getCtParentId, "-1")
|
|
|
+ );
|
|
|
+ }
|
|
|
|
|
|
// 处理getCtTypeNode的特殊条件:不为空且不等于0时,同时查询该值和0
|
|
|
Object ctTypeNode = reqVO.getCtTypeNode();
|