|
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -71,7 +72,9 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
|
|
|
wrapper.eq("p", Purchase::getFlowStatus, dto.getFlowStatus());
|
|
|
wrapper.eq("p", Purchase::getStatus, dto.getStatus());
|
|
|
wrapper.like("s", Supplier::getName, dto.getSupplierName());
|
|
|
- wrapper.and(q -> q.like("p", Purchase::getCode, dto.getCode()).or().like("p", Purchase::getErpCode, dto.getCode()));
|
|
|
+ if (StrUtil.isNotBlank(dto.getCode())) {
|
|
|
+ wrapper.and(q -> q.like("p", Purchase::getCode, dto.getCode()).or().like("p", Purchase::getErpCode, dto.getCode()));
|
|
|
+ }
|
|
|
wrapper.orderByDesc("p", Purchase::getId);
|
|
|
|
|
|
// 查询采购单数据
|