diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java index 626a1a89..f56cac72 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -265,7 +265,19 @@ public class DataEaseController extends Controller { @IsLoginInterface({}) @IsNumericInterface({ "id" }) public void getDataSetContent(int id) { - List list = dm.getDataSetContent(id); + //登录的人员 + int identity_id = Integer.parseInt(CookieUtil.getValue(getRequest(), "identity_id")); + String person_id = CookieUtil.getValue(getRequest(), "person_id"); + + //获取他是哪个城市或者县区的管理员 + //行政区划码 + String area_code = rm.getAreaCode(identity_id, person_id); + //根据区域码,获取区域名称 + String area_name = rm.getAreaName(area_code); + //父亲的区域名称 + String parent_area_name = rm.getParentAreaName(area_name); + + List list = dm.getDataSetContent(id,identity_id,area_name); renderJson(CommonUtil.renderJsonForLayUI(list)); } 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 ae6a4db0..06254fa9 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -568,11 +568,17 @@ public class DataEaseModel { * @param id 数据集id * @return */ - public List getDataSetContent(int id) { + public List getDataSetContent(int id, int identity_id, String area_name) { Record record = Db.findById("t_dp_dataset", "id", id); String tableName = record.getStr("table_name"); - String sql = "select * from `" + tableName + "`"; - return Db.use(DB_NAME).find(sql); + + if (identity_id > 1) { + String sql = "select * from `" + tableName + "` where `行政区划`='" + area_name + "'"; + return Db.use(DB_NAME).find(sql); + } else { + String sql = "select * from `" + tableName + "`"; + return Db.use(DB_NAME).find(sql); + } } /** @@ -589,7 +595,7 @@ public class DataEaseModel { String sql = "delete from `" + tableName + "` where `行政区划`=?"; Db.use(DB_NAME).update(sql, area_name); } else { - String sql = "delete from `" + tableName+"`"; + String sql = "delete from `" + tableName + "`"; Db.use(DB_NAME).update(sql); }