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 25308492..6a5272f6 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -516,10 +516,10 @@ public class DataEaseController extends Controller { @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void getDataSetContentByProvince(int id, int pageNumber, int pageSize) { + public void getDataSetContentByProvince(int id,String keyword, int pageNumber, int pageSize) { if (pageNumber == 0) pageNumber = 1; if (pageSize == 0) pageSize = 20; - Page list = dm.getDataSetContentByProvince(id, pageNumber, pageSize); + Page list = dm.getDataSetContentByProvince(id, keyword,pageNumber, pageSize); 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 aa3cd429..945d1dfe 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -611,7 +611,7 @@ public class DataEaseModel { String tableName = record.getStr("table_name"); Page p = Db.paginate(pageNumber, pageSize, - "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `上级行政区划`='" + area_name + "' and `行政区划` like `%"+keyword+"%`"); + "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `上级行政区划`='" + area_name + "' and `行政区划` like `%" + keyword + "%`"); return p; } @@ -621,12 +621,12 @@ public class DataEaseModel { * @param id * @return */ - public Page getDataSetContentByProvince(int id, int pageNumber, int pageSize) { + public Page getDataSetContentByProvince(int id, String keyword, int pageNumber, int pageSize) { Record record = Db.findById("t_dp_dataset", "id", id); String tableName = record.getStr("table_name"); return Db.paginate(pageNumber, pageSize, - "SELECT *", "from " + DB_NAME + ".`" + tableName + "`"); + "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `行政区划` like '%" + keyword + "%'"); } /**