From 9101ce3ab0a5d36add04fb8c44ddd231d2be7f1f Mon Sep 17 00:00:00 2001
From: ruying408 <1877972603@qq.com>
Date: Fri, 16 Aug 2024 00:15:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aservice=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/core/base/BaseService.java  | 20 ++++++++++++++++++-
 .../com/cool/core/base/BaseServiceImpl.java   | 11 ++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/cool/core/base/BaseService.java b/src/main/java/com/cool/core/base/BaseService.java
index 52db046..a199f27 100644
--- a/src/main/java/com/cool/core/base/BaseService.java
+++ b/src/main/java/com/cool/core/base/BaseService.java
@@ -4,7 +4,6 @@ import cn.hutool.json.JSONObject;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.service.IService;
-
 import java.util.List;
 
 /**
@@ -77,6 +76,15 @@ public interface BaseService<T> extends IService<T> {
      */
     Object list(JSONObject requestParams, QueryWrapper queryWrapper);
 
+    /**
+     * 查询所有
+     * 带关联查询
+     * @param requestParams 请求参数
+     * @param queryWrapper  查询条件
+     * @return 列表信息
+     */
+    Object listWithRelations(JSONObject requestParams, QueryWrapper queryWrapper);
+
     /**
      * 分页查询
      *
@@ -87,6 +95,16 @@ public interface BaseService<T> extends IService<T> {
      */
     Object page(JSONObject requestParams, Page<T> page, QueryWrapper queryWrapper);
 
+    /**
+     * 分页查询
+     * 带关联查询
+     * @param requestParams 请求参数
+     * @param page          分页信息
+     * @param queryWrapper  查询条件
+     * @return 分页信息
+     */
+    Object pageWithRelations(JSONObject requestParams, Page<T> page, QueryWrapper queryWrapper);
+
     /**
      * 查询信息
      *
diff --git a/src/main/java/com/cool/core/base/BaseServiceImpl.java b/src/main/java/com/cool/core/base/BaseServiceImpl.java
index 81abfb0..2969d3d 100644
--- a/src/main/java/com/cool/core/base/BaseServiceImpl.java
+++ b/src/main/java/com/cool/core/base/BaseServiceImpl.java
@@ -78,11 +78,22 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity<T>> e
         return this.list(queryWrapper);
     }
 
+    @Override
+    public Object listWithRelations(JSONObject requestParams, QueryWrapper queryWrapper) {
+        return mapper.selectListWithRelationsByQuery(queryWrapper);
+    }
+
     @Override
     public Object page(JSONObject requestParams, Page<T> page, QueryWrapper queryWrapper) {
         return this.page(page, queryWrapper);
     }
 
+    @Override
+    public Object pageWithRelations(JSONObject requestParams, Page<T> page,
+        QueryWrapper queryWrapper) {
+        return mapper.paginateWithRelations(page, queryWrapper);
+    }
+
     @Override
     public Object info(JSONObject requestParams, Long id) {
         return info(id);