Merge branch 'main' of http://10.10.14.176:3000/huanghai/YunNanDsBase

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(identity_id, dataset_id, area_name, jsonArray);
+        dm.saveDataSet(dataset_id, area_name, jsonArray);
         renderJson(CommonUtil.returnMessageJson(true, "保存成功"));
     }
 }

src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java

@@ -580,10 +580,10 @@ public class DataEaseModel {
      * @param dataset_id 数据集id
      * @param ja         json数组
      */
-    public void saveDataSet(int identity_id, int dataset_id, String area_name, JSONArray ja) {
+    public void saveDataSet( int dataset_id, String area_name, JSONArray ja) {
         String tableName = getTableName(dataset_id);
         String sql = "delete from `" + tableName + "` where `行政区划`=?";
-        Db.use(DB_NAME).update(sql);
+        Db.use(DB_NAME).update(sql,area_name);
 
         List<Record> list = new ArrayList<>();
         for (int i = 0; i < ja.size(); i++) {