开票查询-处理开票项目名称筛选项存在时，结果不正确

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -256,7 +256,12 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                     //根据项目名称先查询项目对应的id集合
                     List<String> projectIdList = cwProjectRecordsMapper.getByProgramName(cwFinanceInvoiceDTO.getProgramName());
                     if (projectIdList.size() > 0) {
-                        queryWrapper.in("a.program_id", projectIdList).or().like("a.program_name", cwFinanceInvoiceDTO.getProgramName());
+                        //queryWrapper.in("a.program_id", projectIdList).or().like("a.program_name", cwFinanceInvoiceDTO.getProgramName());
+                        queryWrapper.and(w ->
+                                w.in("a.program_id", projectIdList)
+                                        .or()
+                                        .like("a.program_name", cwFinanceInvoiceDTO.getProgramName())
+                        );
                     } else {
                         queryWrapper.like("a.program_name", cwFinanceInvoiceDTO.getProgramName());
                     }