From 5156a3ae9b81b1360eb865eccf9c34d5d39e2e22 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 30 May 2023 16:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BC=80=E7=A5=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml | 1 +
 .../biz/fincompanyinvoicing/FinCompanyInvoicingService.java   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
index db3baf7ff4..2aa9cd7a63 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
@@ -16,6 +16,7 @@
             ${ew.sqlSegment}
         </where>
         AND (fci.purchaseSystemSid IS NULL OR LENGTH(fci.purchaseSystemSid) = 0)
+        ORDER BY fci.createTime DESC
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo">
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
index dea8116043..022acc9ccd 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
@@ -251,7 +251,9 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             qw.like("fci.taxpayerNo", query.getTaxpayerNo());
         }
         //移动端查询条件
-
+        if (StringUtils.isNotBlank(query.getAppName())){
+            qw.and(wrapper -> wrapper.like("fci.name", query.getAppName()).or().like("fci.taxpayerNo", query.getAppName()));
+        }
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
         IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<FinCompanyInvoicingVo> p = PagerUtil.pageToVo(pagging, null);