From 2af416ff7e7d1e3e954740bce90a1dd2a723ec80 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Sat, 26 Aug 2023 22:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AAroot?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lihongjie/coal/controller/ResourceController.java  | 6 ++++--
 .../java/cn/lihongjie/coal/dao/ResourceRepository.java    | 4 +++-
 .../java/cn/lihongjie/coal/mapper/ResourceMapper.java     | 4 +++-
 .../java/cn/lihongjie/coal/service/ResourceService.java   | 8 ++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/controller/ResourceController.java b/src/main/java/cn/lihongjie/coal/controller/ResourceController.java
index 2e044803..6e155c56 100644
--- a/src/main/java/cn/lihongjie/coal/controller/ResourceController.java
+++ b/src/main/java/cn/lihongjie/coal/controller/ResourceController.java
@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RequestMapping("/resource")
 @RestController
 @SysLog(module = "资源管理")
@@ -22,12 +24,12 @@ public class ResourceController extends BaseController{
 
     @PostMapping("/apiTree")
     @SysLog(action = "获取接口树")
-    public ResourceTreeDto apiTree() {
+    public List<ResourceTreeDto> apiTree() {
         return this.service.apiTree();
     }
     @PostMapping("/menuTree")
     @SysLog(action = "获取菜单树")
-    public ResourceTreeDto menuTree() {
+    public List<ResourceTreeDto> menuTree() {
         return this.service.menuTree();
     }
 
diff --git a/src/main/java/cn/lihongjie/coal/dao/ResourceRepository.java b/src/main/java/cn/lihongjie/coal/dao/ResourceRepository.java
index 22156d0a..11f7e05e 100644
--- a/src/main/java/cn/lihongjie/coal/dao/ResourceRepository.java
+++ b/src/main/java/cn/lihongjie/coal/dao/ResourceRepository.java
@@ -4,10 +4,12 @@ import cn.lihongjie.coal.entity.ResourceEntity;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ResourceRepository extends BaseRepository<ResourceEntity> {
 
 
     @EntityGraph(attributePaths = {"children"})
-    ResourceEntity findByTypeAndParentIsNull(String type);
+    List<ResourceEntity> findAllByTypeAndParentIsNull(String type);
 }
\ No newline at end of file
diff --git a/src/main/java/cn/lihongjie/coal/mapper/ResourceMapper.java b/src/main/java/cn/lihongjie/coal/mapper/ResourceMapper.java
index 1a39245c..73db4f7c 100644
--- a/src/main/java/cn/lihongjie/coal/mapper/ResourceMapper.java
+++ b/src/main/java/cn/lihongjie/coal/mapper/ResourceMapper.java
@@ -11,6 +11,8 @@ import org.mapstruct.MappingConstants;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.control.DeepClone;
 
+import java.util.List;
+
 @Mapper(
         componentModel = MappingConstants.ComponentModel.SPRING,
         uses = {CommonMapper.class},
@@ -25,5 +27,5 @@ public interface ResourceMapper {
 
     void updateEntity(@MappingTarget ResourceEntity entity, UpdateResourceDto dto);
 
-    ResourceTreeDto toTreeDto(ResourceEntity byTypeAndParentIsNull);
+    List<ResourceTreeDto> toTreeDto(List<ResourceEntity> byTypeAndParentIsNull);
 }
diff --git a/src/main/java/cn/lihongjie/coal/service/ResourceService.java b/src/main/java/cn/lihongjie/coal/service/ResourceService.java
index 0927b372..bca7df6c 100644
--- a/src/main/java/cn/lihongjie/coal/service/ResourceService.java
+++ b/src/main/java/cn/lihongjie/coal/service/ResourceService.java
@@ -184,13 +184,13 @@ public class ResourceService extends BaseService<ResourceEntity, ResourceReposit
         return urls;
     }
 
-    public ResourceTreeDto menuTree() {
+    public List<ResourceTreeDto> menuTree() {
 
-        return this.mapper.toTreeDto(this.repository.findByTypeAndParentIsNull("0"));
+        return this.mapper.toTreeDto(this.repository.findAllByTypeAndParentIsNull("0"));
 
     }
 
-    public ResourceTreeDto apiTree() {
-        return this.mapper.toTreeDto(this.repository.findByTypeAndParentIsNull("3"));
+    public List<ResourceTreeDto> apiTree() {
+        return this.mapper.toTreeDto(this.repository.findAllByTypeAndParentIsNull("3"));
     }
 }