diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BatConfigServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BatConfigServiceImpl.java index d42d80b4..052ced8e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BatConfigServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BatConfigServiceImpl.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; @@ -79,14 +78,14 @@ public class BatConfigServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper(); + wrapper.eq(BatConfig::getIsDeleted, CommonConstant.DELETE_FALSE) .eq(BatConfig::getCaId, hostCaId) - .eq(partIsNotBlank, BatConfig::getPartCode, part) - .le(partIsNotBlank, BatConfig::getSingletonArea, BigDecimal.valueOf(singletonArea)) .orderByDesc(BatConfig::getSingletonArea); - + if(StringUtils.isNotBlank(part)){ + wrapper.eq(BatConfig::getPartCode, part) + .le(BatConfig::getSingletonArea, BigDecimal.valueOf(singletonArea)); + } List batConfigList = baseMapper.selectList(wrapper); if(CollectionUtils.isEmpty(batConfigList)){ return null;