已采购添加 产品名称 产品编号搜索

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -191,6 +191,9 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
             wrapper.and(q -> q.like("json_unquote(p.victoriatourist_json -> '$.contractCode')", dto.getKeyword())
                     .or().in("p", Purchase::getSupplyId, supplierInfoIds)
                     .or().like("p", Purchase::getPurchaseName, dto.getKeyword())
+                    //根据明细 产品名称 产品编号 过滤
+                    .or().like("pi.name", dto.getKeyword())
+                    .or().like("pi.custom_code", dto.getKeyword())
             );
         }
         //高级检索
@@ -234,6 +237,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         //部门(项目组)过滤
         wrapper.eq("de.dept_id", dto.getDeptId());
 
+
         wrapper.groupBy("p.id");
         Page<PurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<PurchaseVo> list = page.getRecords();