解决专业限制条件查询接口没有数据的问题

src/main/java/com/xjrsoft/module/banding/controller/BandingTaskMajorConditionController.java

@@ -1,7 +1,9 @@
 package com.xjrsoft.module.banding.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.banding.dto.BandingTaskMajorConditionListDto;
@@ -46,11 +48,14 @@ public class BandingTaskMajorConditionController {
 
         List<BandingTaskMajorConditionListVo> page = majorSetService.selectJoinList(BandingTaskMajorConditionListVo.class,
                 new MPJLambdaWrapper<BaseMajorSet>().disableSubLogicDel()
-                        .eq(BandingTaskMajorCondition::getBandingTaskId, dto.getBandingTaskId())
+                        .eq(ObjectUtil.isNotNull(dto.getBandingTaskId()), BandingTaskMajorCondition::getBandingTaskId, dto.getBandingTaskId())
+                        .eq(BaseMajorSet::getDeleteMark, DeleteMark.NODELETE.getCode())
                         .select(BandingTaskMajorCondition::getId)
                         .select(BaseMajorSet.class, x -> VoToColumnUtil.fieldsToColumns(BaseMajorSet.class).contains(x.getProperty()))
                         .selectAs(BaseMajorSet::getId, BandingTaskMajorConditionListVo::getMajorSetId)
                         .selectAs(BaseMajorSet::getName, BandingTaskMajorConditionListVo::getMajorSetName)
+                        .selectAs(BandingTaskMajorCondition::getHeight, BandingTaskMajorConditionListVo::getHeight)
+                        .selectAs(BandingTaskMajorCondition::getScore, BandingTaskMajorConditionListVo::getScore)
                         .leftJoin(BandingTaskMajorCondition.class, BandingTaskMajorCondition::getMajorSetId, BaseMajorSet::getId)
         );
         return RT.ok(page);