'commit'

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<Record> list = dm.getDataSetContentByProvince(id, pageNumber, pageSize);
+        Page<Record> list = dm.getDataSetContentByProvince(id, keyword,pageNumber, pageSize);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

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

@@ -611,7 +611,7 @@ public class DataEaseModel {
         String tableName = record.getStr("table_name");
 
         Page<Record> 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<Record> getDataSetContentByProvince(int id, int pageNumber, int pageSize) {
+    public Page<Record> 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 + "%'");
     }
 
     /**