From 1bbe31c62b6647c8e5326e42f8f61b9cce3409b5 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Tue, 28 May 2024 14:52:44 +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

---
 .../java/com/imdroid/beidou/auth/AuthInterceptor.java     | 2 +-
 .../imdroid/beidou/controller/GnssDeviceController.java   | 8 ++++----
 .../com/imdroid/beidou/controller/OssFileController.java  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/auth/AuthInterceptor.java b/sec-beidou/src/main/java/com/imdroid/beidou/auth/AuthInterceptor.java
index ad39a672..10e9d1dd 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/auth/AuthInterceptor.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/auth/AuthInterceptor.java
@@ -20,7 +20,7 @@ public class AuthInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String username = SessionUtils.getCurrentUser(request);
-        if (!StringUtils.hasText(username)) {
+        if (!StringUtils.isEmpty(username)) {
             return true;
         }
         String clientType = request.getHeader("x-imdroid-type");
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 c56c64a4..a3a674f8 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
@@ -106,22 +106,22 @@ 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);
             }
             //项目号
             String project_id = search.getString("project_id");
-            if (!StringUtils.hasText(project_id)) {
+            if (!StringUtils.isEmpty(project_id)) {
                 queryWrapper.like("project_id", project_id);
             }
             //所属组织
             String tenantname = search.getString("tenantname");
-            if (!StringUtils.hasText(tenantname)) {
+            if (!StringUtils.isEmpty(tenantname)) {
                 queryWrapper.like("tenantname", tenantname);
             }
             //设备类型
diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/OssFileController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/OssFileController.java
index 5d4e6974..c0daf47c 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/OssFileController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/OssFileController.java
@@ -54,7 +54,7 @@ public class OssFileController {
     @RequestMapping("/upload-device-image")
     public HttpResult upload(@RequestParam("file") MultipartFile multipartFile, String deviceId) throws Exception {
         System.out.println("upload device image:" + multipartFile.getOriginalFilename());
-        if (StringUtils.hasText(deviceId)) {
+        if (StringUtils.isEmpty(deviceId)) {
             return HttpResult.fail("设备编号不能为空");
         }