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

---
 .../base/DataEase/Controller/DataEaseController.java     | 3 ---
 .../com/dsideal/base/DataEase/Model/DataEaseModel.java   | 9 ++++++---
 2 files changed, 6 insertions(+), 6 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 ba50fec2..efd725fb 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -65,9 +65,6 @@ public class DataEaseController extends Controller {
         //拼接一下URL的最终地址
         JSONObject jo = new JSONObject();
         jo.put("city_name", city_name);
-        if (city_name.equals("西双版纳")) {
-            city_name = city_name + "州";
-        }
         String base64Str = Base64.encode(jo.toString());
         //记录最后一次操作的是哪个市或者县区
         dm.writeLastArea(city_name);
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 d24be40b..8e96ca55 100644
--- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
+++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
@@ -157,6 +157,9 @@ public class DataEaseModel {
      * @return 城市编码
      */
     public String getCityCode(String cityName) {
+        if (cityName.contains("西双版纳")) {
+            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");
@@ -528,8 +531,8 @@ public class DataEaseModel {
         String sql = "select * from t_dm_area where full_name = ?";
         Record record = Db.findFirst(sql, area_name);
         if (record != null) return area_name;
-        sql = "select * from t_dm_area where area_name=?";
-        record = Db.findFirst(sql, area_name);
+        sql = "select * from t_dm_area where area_name like %" + area_name + "%";
+        record = Db.findFirst(sql);
         return record.getStr("full_name");
     }
 
@@ -637,7 +640,7 @@ public class DataEaseModel {
         Record record = Db.findById("t_dp_dataset", "id", id);
         String tableName = record.getStr("table_name");
 
-        String sql = "select * from `" + tableName+"`";
+        String sql = "select * from `" + tableName + "`";
         return Db.use(DB_NAME).find(sql);
     }