From d0cfe67b5cae5086dc8a70e64ead3c4ddd16e263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 4 Nov 2024 16:34:35 +0800
Subject: [PATCH] 'commit'

---
 .../dsideal/base/DataEase/Controller/DataEaseController.java   | 3 ++-
 .../java/com/dsideal/base/DataEase/Model/DataEaseModel.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
index 920f9083..636926e7 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -43,6 +43,7 @@ public class DataEaseController extends Controller {
     @Before({GET.class})
     @EmptyInterface({"city_name"})
     public void route(String city_name) {
+        city_name = dm.getFullAreaName(city_name);
         //大屏名称
         String dataVisualizationName = BaseApplication.PropKit.get("dataEase.dataVisualizationName");
         //发布的地址
@@ -127,7 +128,7 @@ public class DataEaseController extends Controller {
         String tableName = record.getStr("table_name");
         String dataSetName = record.getStr("dataset_name");
         //导出excel
-        String upPath = BaseApplication.PropKit.get("upload.path")+"/";
+        String upPath = BaseApplication.PropKit.get("upload.path") + "/";
         String excelFileName = dm.exportExcel(identity_id, tableName, dataSetName, upPath, area_name);
         System.out.println(excelFileName);
         //renderFile
diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
index e553c3a9..60ae12f2 100644
--- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
+++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
@@ -105,7 +105,8 @@ public class DataEaseModel {
     public String getCityCode(String cityName) {
         String full_name = getFullAreaName(cityName);
         String sql = "select area_code from t_city_code where area_name=?";
-        return Db.findFirst(sql, full_name).getStr("area_code");
+        String area_code=Db.findFirst(sql, full_name).getStr("area_code");
+        return area_code;
     }
 
     /**