From bf7d31f5a3c8eb3f8c2bd50a4b5149bdbe396ca3 Mon Sep 17 00:00:00 2001
From: sol <bgasolyang@gmail.com>
Date: Wed, 17 Sep 2025 19:44:06 +0800
Subject: [PATCH] refactor(common): Optimized the basic service interface and
 tree service interface

---
 .../com/bgasol/common/core/base/service/BaseService.java    | 4 ++--
 .../bgasol/common/core/base/service/BaseTreeService.java    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java b/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java
index 5506770..953c90b 100644
--- a/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java
+++ b/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java
@@ -356,8 +356,8 @@ public abstract class BaseService<ENTITY extends BaseEntity, PAGE_DTO extends Ba
      * @return 实体列表
      */
     @Transactional(readOnly = true)
-    public List<ENTITY> findAll(QueryWrapper<ENTITY> queryWrapper) {
-        List<ENTITY> entities = commonBaseMapper().selectList(queryWrapper);
+    public List<ENTITY> findAll(Wrapper<ENTITY> wrapper) {
+        List<ENTITY> entities = commonBaseMapper().selectList(wrapper);
 
         // 缓存查询结果
         if (ObjectUtils.isNotEmpty(commonBaseRedissonClient())) {
diff --git a/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseTreeService.java b/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseTreeService.java
index 6601c75..449ecd9 100644
--- a/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseTreeService.java
+++ b/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseTreeService.java
@@ -29,8 +29,8 @@ public abstract class BaseTreeService<ENTITY extends BaseTreeEntity<ENTITY>, PAG
      * @return 实体列表
      */
     @Transactional(readOnly = true)
-    public List<ENTITY> findAll(QueryWrapper<ENTITY> queryWrapper) {
-        return this.findTreeAll(null, queryWrapper);
+    public List<ENTITY> findAll() {
+        return this.findTreeAll(null, null);
     }
 
     /**
@@ -45,7 +45,7 @@ public abstract class BaseTreeService<ENTITY extends BaseTreeEntity<ENTITY>, PAG
             queryWrapper = new QueryWrapper<>();
         }
         if (parentId == null) {
-            queryWrapper.isNull(PARENT_ID);
+            queryWrapper.isNull(PARENT_ID).or().eq(PARENT_ID, "");
         } else {
             queryWrapper.eq(PARENT_ID, parentId);
         }