From 9644f11b6642dbe0484b4638da319098e4516d56 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 4 Jul 2023 10:28:15 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/base/controller/BaseInvoiceController.java  | 9 ++++++++-
 dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml   | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index ee76a75d..dc5ef5aa 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -141,6 +141,9 @@ public class BaseInvoiceController extends AbstractController {
         String businessCode = (String)map.get("businessCode");
         String qsr = (String)map.get("qsr");
         String rzhr = (String)map.get("rzhr");
+        String sortPzbh = String.valueOf(map.get("sortPzbh"));
+        String sortBzdh = String.valueOf(map.get("sortBzdh"));
+        String sortKprq = String.valueOf(map.get("sortKprq"));
         String taxRate = String.valueOf(map.get("taxRate"));
         log.info("taxRate={}",taxRate);
         String inAccountStatus = (String)map.get("inAccountStatus");
@@ -169,6 +172,9 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
         pramsMap.put("company", map.get("company"));
         pramsMap.put("menuId", map.get("menuId"));
+        pramsMap.put("sortPzbh",sortPzbh);
+        pramsMap.put("sortBzdh",sortBzdh);
+        pramsMap.put("sortKprq",sortKprq);
         pramsMap.put("xfmc", xfmc);
         pramsMap.put("qsr", qsr);
         if (StringUtils.isNotBlank(rzhr)) {
@@ -202,7 +208,8 @@ public class BaseInvoiceController extends AbstractController {
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
             gfshList.add(gfsh);
         } else {
-            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+//            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+            gfshList = getGfshList(gfshList,getUserInfo().getCompanyCodes());
         }
         pramsMap.put("gfsh", gfshList);
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 6e4af301..bdc533c0 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -241,6 +241,7 @@
         <if test="taxRate=='多税率'">
             and t.tax_rate like '%,%'
         </if>
+
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
             resultMap="BaseResultMap" databaseId="oracle">