'commit'

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

@@ -322,6 +322,7 @@ public class DataEaseController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"id"})
     public void getDataSetContent(int id, String keyword, int pageNumber, int pageSize) {
+        if(StrKit.isBlank(keyword))keyword="";
         if (pageNumber == 0) pageNumber = 1;
         if (pageSize == 0) pageSize = 20;
         //登录的人员
@@ -392,6 +393,7 @@ public class DataEaseController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"id"})
     public void getDataSetContentByCity(int id, String keyword, int pageNumber, int pageSize) {
+        if(StrKit.isBlank(keyword))keyword="";
         if (pageNumber == 0) pageNumber = 1;
         if (pageSize == 0) pageSize = 20;
         //登录的人员
@@ -519,6 +521,7 @@ public class DataEaseController extends Controller {
     public void getDataSetContentByProvince(int id, String keyword, int pageNumber, int pageSize) {
         if (pageNumber == 0) pageNumber = 1;
         if (pageSize == 0) pageSize = 20;
+        if(StrKit.isBlank(keyword))keyword="";
         Page<Record> list = dm.getDataSetContentByProvince(id, keyword, pageNumber, pageSize);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }