销售合同样品单搜索问题处理

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -243,9 +243,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             List<Long> corporationIds = corporationService.listObject(Corporation::getId, q -> q.like(Corporation::getName, dto.getKeyword()));
             List<Long> customerIds = customerService.listObject(Customer::getId, q -> q.like(Customer::getName, dto.getKeyword()));
             wrapper.and(q -> q
-                    .eq("t1", Contract::getCode, dto.getKeyword())
-                    .in("t1", Contract::getSellCorporationId, corporationIds)
-                    .in("t1", Contract::getBuyCorporationId, customerIds)
+                    .like("t1", Contract::getCode, dto.getKeyword())
+                    .or().in("t1", Contract::getSellCorporationId, corporationIds)
+                    .or().in("t1", Contract::getBuyCorporationId, customerIds)
             );
         }
 

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -111,8 +111,8 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             List<Long> customerIds = customerService.listObject(Customer::getId, q -> q.like(Customer::getName, dto.getKeyword()));
             wrapper.and(q -> q
-                    .eq("t1", Sample::getCode, dto.getKeyword())
-                    .in("t1", Sample::getBuyCorporationId, customerIds)
+                    .like("t1", Sample::getCode, dto.getKeyword())
+                    .or().in("t1", Sample::getBuyCorporationId, customerIds)
             );
         }
         Page<SampleVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);