合并代码

puzhibing

2024-09-11 40866e3a4da50bab9aac93cb864eba272ba7122f

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java

@@ -42,10 +42,10 @@
   }
   @GetMapping("/pageListR")
   @ApiOperation(value = "获取开票公司和类型列表", tags = {"管理后台-发票管理"})
   public R<List<TInvoiceType>> pageListR(String company){
   public R<List<TInvoiceType>> pageListR(String invoicingCompany ){
      List<TInvoiceType> list = new ArrayList<>();
      if (StringUtils.hasLength(company)){
         list = invoiceTypeService.lambdaQuery().eq(TInvoiceType::getInvoicingCompany, company).list();
      if (StringUtils.hasLength(invoicingCompany )){
         list = invoiceTypeService.lambdaQuery().eq(TInvoiceType::getInvoicingCompany, invoicingCompany).list();
      }else{
         list = invoiceTypeService.lambdaQuery().list();
      }