diff --git a/WebRoot/upload/412E2178-1704-4997-97C5-22A42F478ED8.xlsx b/WebRoot/upload/412E2178-1704-4997-97C5-22A42F478ED8.xlsx new file mode 100644 index 00000000..77e7b51c Binary files /dev/null and b/WebRoot/upload/412E2178-1704-4997-97C5-22A42F478ED8.xlsx differ diff --git a/WebRoot/upload/BEF26C40-D609-4C55-8BED-79285B3611C0.xlsx b/WebRoot/upload/BEF26C40-D609-4C55-8BED-79285B3611C0.xlsx new file mode 100644 index 00000000..509d0703 Binary files /dev/null and b/WebRoot/upload/BEF26C40-D609-4C55-8BED-79285B3611C0.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 d5f76c61..8c8aa33d 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; public class DataEaseModel { //DataEase数据库名称 public static String DB_NAME = "dataease"; + /** * 获取当前人员可以看到哪些数据集 * @@ -36,7 +37,10 @@ public class DataEaseModel { for (Record record : list) { //这个数据集,当前的区域,已经填写了多少条数据 String table_name = record.getStr("table_name"); - sql = "select count(1) as c from `" + table_name + "` where `行政区划`='" + area_name + "'"; + sql = "select count(1) as c from `" + table_name + "`"; + if (identity_id > 1) { + sql += sql + " where `行政区划`='" + area_name + "'"; + } int cnt = Db.use(DB_NAME).queryInt(sql); record.set("fill_count", cnt); } @@ -365,6 +369,7 @@ public class DataEaseModel { /** * 获取指定id的行政区划 + * * @param id * @return */