From 2e9a201c8b673674d2c9c4aad00ea8ce7b01c866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 7 Nov 2024 09:31:14 +0800
Subject: [PATCH] 'commit'

---
 .../DataEase/Controller/DataEaseController.java     |  2 +-
 .../dsideal/base/DataEase/Model/DataEaseModel.java  | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 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 32a4a45f..626a1a89 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -297,7 +297,7 @@ public class DataEaseController extends Controller {
             jo.put("上级行政区划", parent_area_name);
         }
         //保存
-        dm.saveDataSet(id, area_name, jsonArray);
+        dm.saveDataSet(identity_id,id, area_name, jsonArray);
         renderJson(CommonUtil.returnMessageJson(true, "保存成功"));
     }
 }
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 8f492876..ae6a4db0 100644
--- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
+++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
@@ -579,14 +579,19 @@ public class DataEaseModel {
      * 保存数据集对应的表
      *
      * @param id 数据集id
-     * @param ja         json数组
+     * @param ja json数组
      */
-    public void saveDataSet(int id, String area_name, JSONArray ja) {
+    public void saveDataSet(int identity_id, int id, String area_name, JSONArray ja) {
         Record record = Db.findById("t_dp_dataset", "id", id);
         String tableName = record.getStr("table_name");
 
-        String sql = "delete from `" + tableName + "` where `行政区划`=?";
-        Db.use(DB_NAME).update(sql, area_name);
+        if (identity_id > 1) {
+            String sql = "delete from `" + tableName + "` where `行政区划`=?";
+            Db.use(DB_NAME).update(sql, area_name);
+        } else {
+            String sql = "delete from `" + tableName+"`";
+            Db.use(DB_NAME).update(sql);
+        }
 
         List<Record> list = new ArrayList<>();
         for (int i = 0; i < ja.size(); i++) {