From cbaee8600fcd5c863ec6829b826e62e5937e90af Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Tue, 28 May 2024 15:03:15 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E8=A7=A3=E7=AE=97?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=9B=B2=E7=BA=BF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beidou/controller/GnssDeviceController.java      |  4 ++--
 .../imdroid/beidou/service/CommonExcelService.java   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
index a3a674f8..681aa2aa 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
@@ -337,12 +337,12 @@ public class GnssDeviceController extends BasicController{
             JSONObject search = (JSONObject) JSONObject.parse(searchParams);
             //设备号
             String deviceid = search.getString("deviceid");
-            if (!StringUtils.hasText(deviceid)) {
+            if (!StringUtils.isEmpty(deviceid)) {
                 queryWrapper.like("deviceid", deviceid);
             }
             //父设备号
             String parentid = search.getString("parentid");
-            if (!StringUtils.hasText(parentid)) {
+            if (!StringUtils.isEmpty(parentid)) {
                 queryWrapper.like("parentid", parentid);
             }
             //设备类型
diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java b/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java
index 85ee22d5..b6c0250f 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java
@@ -47,7 +47,7 @@ public interface CommonExcelService<T, R> {
      */
     default AbstractWrapper prepareQueryWrapper() {
         QueryWrapper<T> queryWrapper = new QueryWrapper<>();
-        if (!StringUtils.hasText(getOrderByColumn())) {
+        if (!StringUtils.isEmpty(getOrderByColumn())) {
             if ("desc".equals(getOrder())) {
                 queryWrapper.orderByDesc(getOrderByColumn());
             } else {
@@ -192,19 +192,19 @@ public interface CommonExcelService<T, R> {
      */
     default void setQueryWrapper(AbstractWrapper queryWrapper, String paraName, Object paraValue) {
         // String
-        if (paraName.startsWith("s") && !StringUtils.hasText((String)paraValue)) {
+        if (paraName.startsWith("s") && !StringUtils.isEmpty(paraValue)) {
             addStringQueryWrapper(queryWrapper, paraName, paraValue);
         }
         // Number
-        else if (paraName.startsWith("n") && !StringUtils.hasText((String)paraValue)) {
+        else if (paraName.startsWith("n") && !StringUtils.isEmpty(paraValue)) {
             addNumberQueryWrapper(queryWrapper, paraName, paraValue);
         }
         // Date & Time
-        else if (paraName.startsWith("d") && !StringUtils.hasText((String)paraValue)) {
+        else if (paraName.startsWith("d") && !StringUtils.isEmpty(paraValue)) {
             addDateQueryWrapper(queryWrapper, paraName, paraValue);
         }
         // Boolean
-        else if (paraName.startsWith("b") && !StringUtils.hasText((String)paraValue)) {
+        else if (paraName.startsWith("b") && !StringUtils.isEmpty(paraValue)) {
             addBooleanQueryWrapper(queryWrapper, paraName, paraValue);
         }
     }
@@ -216,7 +216,7 @@ public interface CommonExcelService<T, R> {
     default void addStringQueryWrapper(AbstractWrapper queryWrapper, String paraName, Object paraValue) {
         String column = getColumn(paraName);
         String value = paraValue.toString();
-        if (StringUtils.hasText(value)) {
+        if (StringUtils.isEmpty(value)) {
             return;
         }
         if (paraName.startsWith("s_")) {