diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java index 3c73cc5..86d4f00 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java @@ -12,6 +12,7 @@ import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyT import org.apache.ibatis.annotations.Mapper; import com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo.*; import org.apache.ibatis.annotations.Param; +import org.springframework.util.CollectionUtils; /** * 抢险任务主 Mapper @@ -31,7 +32,7 @@ public interface EmergencyTaskMapper extends BaseMapperX { if (reqVO.getEndTime() != null) { endDateTime = reqVO.getEndTime().atTime(LocalTime.MAX); } - return selectPage(reqVO, new LambdaQueryWrapperX() + LambdaQueryWrapperX sql = new LambdaQueryWrapperX() .likeIfPresent(EmergencyTaskDO::getTaskNo, reqVO.getTaskNo()) .eqIfPresent(EmergencyTaskDO::getEmergencyTypeId, reqVO.getEmergencyTypeId()) .eqIfPresent(EmergencyTaskDO::getEmergencyHarmId, reqVO.getEmergencyHarmId()) @@ -39,9 +40,12 @@ public interface EmergencyTaskMapper extends BaseMapperX { .likeIfPresent(EmergencyTaskDO::getEmergencyLocation, reqVO.getEmergencyLocation()) .eqIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatus()) .eqIfPresent(EmergencyTaskDO::getCompanyId, reqVO.getCompanyId()) - .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime) - .inIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatusList()) - .orderByDesc(EmergencyTaskDO::getId)); + .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime); + if(!CollectionUtils.isEmpty(reqVO.getBusiStatusList())){ + sql.in(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatusList()); + } + sql.orderByDesc(EmergencyTaskDO::getId); + return selectPage(reqVO, sql); } int deleteByTaskNo(@Param("taskNo") String taskNo);