diff --git a/WebRoot/upload/2E965D9C-055D-4143-8800-6CB2AA695539.xlsx b/WebRoot/upload/2E965D9C-055D-4143-8800-6CB2AA695539.xlsx new file mode 100644 index 00000000..160f780a Binary files /dev/null and b/WebRoot/upload/2E965D9C-055D-4143-8800-6CB2AA695539.xlsx differ diff --git a/WebRoot/upload/2EE74397-819F-4F71-BADC-DD522F976481.xlsx b/WebRoot/upload/2EE74397-819F-4F71-BADC-DD522F976481.xlsx new file mode 100644 index 00000000..061dea91 Binary files /dev/null and b/WebRoot/upload/2EE74397-819F-4F71-BADC-DD522F976481.xlsx differ diff --git a/WebRoot/upload/3A73D884-78BB-41FE-81F7-7FC44BDB7C75.xlsx b/WebRoot/upload/3A73D884-78BB-41FE-81F7-7FC44BDB7C75.xlsx new file mode 100644 index 00000000..229f23d1 Binary files /dev/null and b/WebRoot/upload/3A73D884-78BB-41FE-81F7-7FC44BDB7C75.xlsx differ 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 a5c02b46..95d40ece 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -679,7 +679,7 @@ public class DataEaseModel { fillDefaultXzqh(3, tableName); //对此表中的数据进行直接导出EXCEL String sql = "select * from `" + tableName + "`"; - sql = sql + "where `行政区划`='" + area_name + "'"; + sql = sql + "where `上级行政区划`='" + area_name + "'"; //获取一下表有哪些列 List columnNames = getColumns(tableName);