From fc032745864af5ff4006b2310860192a714cd4c2 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 28 Aug 2023 09:10:52 +0800
Subject: [PATCH] =?UTF-8?q?test=E4=BB=A3=E7=A0=81=E8=A1=A5=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/controller/ExcelController.java  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java
index 08d36d26..c28d4ccd 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java
@@ -231,7 +231,19 @@ public class ExcelController extends AbstractController {
                     String newCondition = prams.toString();
                     pramsMap.put("conditions", newCondition);
                 } else {
-                    prams.put("gfsh", gfsh);
+                    String gfmc = "";
+                    List<Tax> org = getUserInfo().getOrg();
+                    if (org != null && org.size() > 0) {
+                        for (Tax tax : org) {
+                            if (tax.getTaxno().equals(gfsh)) {
+                                gfmc = tax.getTaxname();
+                            }
+                        }
+                    }
+                    prams.put("gfmc", gfmc);
+                    prams.put("gfsh",gfsh);
+                    String newCondition = prams.toString();
+                    pramsMap.put("conditions", newCondition);
                 }
             } else {
                 pramsMap.put("conditions", condition);