From 130ff8b592794478a898de67f1a88668d4ebd539 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 29 Nov 2024 11:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E6=AD=A3=E5=B8=B8=E5=90=AF=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/framework/controller/BaseController.java      | 4 +++-
 .../backend/framework/service/impl/BaseServiceImpl.java   | 3 +++
 .../deploy/backend/service/impl/UserServiceImpl.java      | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/framework/controller/BaseController.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/controller/BaseController.java
index ca88630a..4b55cf14 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/framework/controller/BaseController.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/controller/BaseController.java
@@ -6,6 +6,7 @@ import com.qqchen.deploy.backend.framework.query.BaseQuery;
 import com.qqchen.deploy.backend.framework.api.Response;
 import com.qqchen.deploy.backend.framework.service.IBaseService;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.core.GenericTypeResolver;
 import org.springframework.data.domain.Page;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -81,4 +82,5 @@ public abstract class BaseController<T extends Entity<ID>, D extends BaseDTO, ID
      * @param data 要导出的数据
      */
     protected abstract void exportData(HttpServletResponse response, List<D> data);
-} 
\ No newline at end of file
+
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java
index 2d2087e9..0e1768ff 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java
@@ -116,6 +116,9 @@ public abstract class BaseServiceImpl<T extends Entity<ID>, D extends BaseDTO, I
 
     @Override
     public List<D> findAll(BaseQuery query) {
+        if (query == null) {
+            return findAll();  // 如果查询参数为空，返回所有数据
+        }
         BooleanBuilder builder = createQueryPredicate(query);
         Sort sort = createSort(query);
         List<T> entities = repository.findAllByCondition(builder, sort);
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserServiceImpl.java
index 6918c2ab..54272dd9 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserServiceImpl.java
@@ -122,8 +122,8 @@ public class UserServiceImpl extends BaseServiceImpl<User, UserDTO, Long> implem
         return null;
     }
 
-    @Override
-    public List<UserDTO> findAll(BaseQuery query) {
-        return null;
-    }
+//    @Override
+//    public List<UserDTO> findAll(BaseQuery query) {
+//        return null;
+//    }
 }
\ No newline at end of file