From 128e8e01be1a9c49b7a4aa82a182e6cf010df1d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 30 Dec 2024 09:10:40 +0800
Subject: [PATCH] 'commit'

---
 .../dsideal/base/DataEase/Controller/DataEaseController.java   | 3 +++
 1 file changed, 3 insertions(+)

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 0744f6fc..f7b60c88 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/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));
     }