'commit'

src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java

@@ -318,12 +318,13 @@ public class DataEaseController extends Controller {
      *
      * @param id         数据集id
      * @param pageNumber 第几页
+     * @param keyword    关键字
      * @param pageSize   每页多少条数据
      */
     @Before(GET.class)
     @IsLoginInterface({})
     @IsNumericInterface({"id"})
-    public void getDataSetContent(int id, int pageNumber, int pageSize) {
+    public void getDataSetContent(int id, String keyword, int pageNumber, int pageSize) {
         if (pageNumber == 0) pageNumber = 1;
         if (pageSize == 0) pageSize = 20;
         //登录的人员
@@ -336,7 +337,7 @@ public class DataEaseController extends Controller {
         //根据区域码，获取区域名称
         String area_name = rm.getAreaName(area_code);
 
-        Page<Record> pageList = dm.getDataSetContent(id, identity_id, area_name, pageNumber, pageSize);
+        Page<Record> pageList = dm.getDataSetContent(id, identity_id, area_name,keyword, pageNumber, pageSize);
         renderJson(CommonUtil.renderJsonForLayUI(pageList));
     }
 

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

@@ -585,16 +585,16 @@ public class DataEaseModel {
      * @param id 数据集id
      * @return
      */
-    public Page<Record> getDataSetContent(int id, int identity_id, String area_name, int pageNumber, int pageSize) {
+    public Page<Record> getDataSetContent(int id, int identity_id, String area_name, String keyword, int pageNumber, int pageSize) {
         Record record = Db.findById("t_dp_dataset", "id", id);
         String tableName = record.getStr("table_name");
         Page<Record> p;
         if (identity_id > 1) {
             p = Db.paginate(pageNumber, pageSize,
-                    "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'");
+                    "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where (`行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "') and `行政区划` like '%" + keyword + "%'");
         } else {
             p = Db.paginate(pageNumber, pageSize,
-                    "SELECT *", "from " + DB_NAME + ".`" + tableName + "`");
+                    "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `行政区划` like '%" + keyword + "%'");
         }
         return p;
     }
@@ -640,7 +640,6 @@ public class DataEaseModel {
     }
 
 
-
     /**
      * 导出Excel
      *