'commit'

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

@@ -38,6 +38,9 @@ public class DataEaseModel {
             for (Record record : list) {
                 //这个数据集，当前的区域，已经填写了多少条数据
                 String table_name = record.getStr("table_name");
+                if(table_name.equals("excel_区域人口流动分布_374179b760")){
+                    System.out.println("ddd");
+                }
                 sql = "select count(1) as c from `" + table_name + "`";
                 if (identity_id > 1) {
                     sql += " where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'";
@@ -452,7 +455,7 @@ public class DataEaseModel {
         //对此表中的数据进行直接导出EXCEL
         String sql = "select * from `" + tableName + "`";
         if (identity_id > 1) {
-            sql = sql + "where `行政区划`='" + area_name + "'";
+            sql = sql + "where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'" ;
         }
         //获取一下表有哪些列
         //List<String> columnNames = getColumns(tableName);
@@ -586,7 +589,7 @@ public class DataEaseModel {
         String tableName = record.getStr("table_name");
 
         if (identity_id > 1) {
-            String sql = "select * from `" + tableName + "` where `行政区划`='" + area_name + "'";
+            String sql = "select * from `" + tableName + "` where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'";
             return Db.use(DB_NAME).find(sql);
         } else {
             String sql = "select * from `" + tableName + "`";