From 07949b716ca2dd69e53b90eb754eb9ae6e1afaa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 25 Oct 2024 19:37:33 +0800
Subject: [PATCH] 'commit'

---
 .../base/Base/Controller/BaseController.java      | 15 +++++++++++++--
 .../com/dsideal/base/Base/Model/BaseModel.java    | 10 ++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dsideal/base/Base/Controller/BaseController.java b/src/main/java/com/dsideal/base/Base/Controller/BaseController.java
index 83330c57..8486792e 100644
--- a/src/main/java/com/dsideal/base/Base/Controller/BaseController.java
+++ b/src/main/java/com/dsideal/base/Base/Controller/BaseController.java
@@ -860,7 +860,7 @@ public class BaseController extends Controller {
     @IsLoginInterface({})
     public void saveDataSetTable(int dataset_id, String data) {
         //登录的人员
-        //int identity_id = Integer.parseInt(CookieUtil.getValue(getRequest(), "identity_id"));
+        int identity_id = Integer.parseInt(CookieUtil.getValue(getRequest(), "identity_id"));
         String person_id = CookieUtil.getValue(getRequest(), "person_id");
         //如果是市/州，名称
         //如果是县区，名称
@@ -873,7 +873,18 @@ public class BaseController extends Controller {
                 return;
             }
         }
-        model.saveDataSetTable(dataset_id, xmqh, jsonArray);
+        if (identity_id > 1) {
+            for (Object o : jsonArray) {
+                net.sf.json.JSONObject jo = (net.sf.json.JSONObject) o;
+                if (!jo.containsKey("行政区划")) {
+                    renderJson(CommonUtil.returnMessageJson(false, "数据集数据不是省级管理员操作，但却没有行政区划的字段！"));
+                    return;
+                }
+                break;
+            }
+        }
+        //保存
+        model.saveDataSetTable(identity_id, dataset_id, xmqh, jsonArray);
         renderJson(CommonUtil.returnMessageJson(true, "保存成功"));
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/dsideal/base/Base/Model/BaseModel.java b/src/main/java/com/dsideal/base/Base/Model/BaseModel.java
index ba02e642..621f7b54 100644
--- a/src/main/java/com/dsideal/base/Base/Model/BaseModel.java
+++ b/src/main/java/com/dsideal/base/Base/Model/BaseModel.java
@@ -1026,10 +1026,12 @@ public class BaseModel {
      * @param dataset_id 数据集id
      * @param ja         json数组
      */
-    public void saveDataSetTable(int dataset_id, String xmqh, JSONArray ja) {
-        String tableName = getTableName(dataset_id).getStr("table_name");
-        String sql = "delete from dataease.`" + tableName + "` where `行政区划`=?";
-        Db.update(sql, xmqh);
+    public void saveDataSetTable(int identity_id, int dataset_id, String xmqh, JSONArray ja) {
+        if (identity_id > 1) {
+            String tableName = getTableName(dataset_id).getStr("table_name");
+            String sql = "delete from dataease.`" + tableName + "` where `行政区划`=?";
+            Db.update(sql, xmqh);
+        }
         List<Record> list = new ArrayList<>();
         for (int i = 0; i < ja.size(); i++) {
             JSONObject jsonObject = ja.getJSONObject(i);