样品单 添加客户名称搜索

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

@@ -13,6 +13,7 @@ import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.vo.ContractProductVo;
 import com.fjhx.sale.entity.sample.po.Sample;
@@ -70,7 +71,11 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
             wrapper.eq("t1", Sample::getStatus, dto.getStatus());
         }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
-            wrapper.keyword(dto.getKeyword(), new SqlField("t1", Sample::getCode));
+            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)
+            );
         }
         Page<SampleVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<SampleVo> list = page.getRecords();