样品单、外销合同页面增加“业务员”筛选条件

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

@@ -264,7 +264,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("t1", Contract::getStatus, dto.getStatus());
         }
-
         if (StringUtils.isNotEmpty(dto.getSellCorporationId())) {
             wrapper.eq("t1", Contract::getSellCorporationId, dto.getSellCorporationId());
         }
@@ -277,6 +276,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             List<Long> customerIds = customerService.listObject(Customer::getId, q -> q.like(Customer::getName, dto.getKeyword()));
             wrapper.and(q -> q
                     .like("t1", Contract::getCode, dto.getKeyword())
+                    .or().like("t1",Contract::getUserName,dto.getUserName())
                     .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

@@ -140,6 +140,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
             List<Long> customerIds = customerService.listObject(Customer::getId, q -> q.like(Customer::getName, dto.getKeyword()));
             wrapper.and(q -> q
                     .like("t1", Sample::getCode, dto.getKeyword())
+                    .like("t1", Sample::getUserName, dto.getKeyword())
                     .or().in("t1", Sample::getBuyCorporationId, customerIds)
             );
         }