销售合同搜索条件更改

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

@@ -217,7 +217,14 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             wrapper.in("t1.refundStatusNew", Arrays.asList(dto.getRefundStatusNew().split(",")));
         }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
-            wrapper.keyword(dto.getKeyword(), new SqlField("t1", Contract::getCode));
+            //归属公司
+            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)
+            );
         }
 
         //过滤合同类型