|
@@ -80,7 +80,7 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
|
|
wrapper.eq("li", LogisticsInfos::getStatus, dto.getStatus());
|
|
wrapper.eq("li", LogisticsInfos::getStatus, dto.getStatus());
|
|
if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
|
|
if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
|
|
//判断是否是 采购到货 采购退货 来源
|
|
//判断是否是 采购到货 采购退货 来源
|
|
- boolean flag = !Objects.equals(dto.getBusinessType(), 1) || !Objects.equals(dto.getBusinessType(), 5);
|
|
|
|
|
|
+ boolean flag = !Objects.equals(dto.getBusinessType(), 1) && !Objects.equals(dto.getBusinessType(), 5);
|
|
|
|
|
|
List<String> companyCodes = companyInfoService.listObject(CompanyInfo::getCode, q -> q.like(CompanyInfo::getName, dto.getKeyword()));
|
|
List<String> companyCodes = companyInfoService.listObject(CompanyInfo::getCode, q -> q.like(CompanyInfo::getName, dto.getKeyword()));
|
|
wrapper.and(q -> q.like("li", LogisticsInfos::getCode, dto.getKeyword())
|
|
wrapper.and(q -> q.like("li", LogisticsInfos::getCode, dto.getKeyword())
|