'commit'

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

@@ -364,11 +364,11 @@ public class DataEaseModel {
     public String exportExcel(int identity_id, String tableName, String exportPath, String area_name) throws IOException {
         //补全默认行政区划
         if (identity_id == 2) {
-            String sql = "update `" + tableName + "` set `行政区划`='昆明市' where `行政区划` is null";
+            String sql = "update `" + tableName + "` set `行政区划`='昆明市',`上级行政区划`='云南省' where `行政区划` is null or `上级行政区划` is null";
             Db.use(DB_NAME).update(sql);
         }
         if (identity_id == 3) {
-            String sql = "update `" + tableName + "` set `行政区划`='寻甸县' where `行政区划` is null";
+            String sql = "update `" + tableName + "` set `行政区划`='寻甸县',`上级行政区划`='昆明市' where `行政区划` is null  or `上级行政区划` is null";
             Db.use(DB_NAME).update(sql);
         }
         //对此表中的数据进行直接导出EXCEL