From 1af46e932390e92271b27ea99513d5e23d3811ef Mon Sep 17 00:00:00 2001
From: none <none>
Date: Sun, 19 Feb 2023 17:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/backend/DepartmentController.java   | 10 +++++++---
 .../xyz/playedu/api/service/DepartmentService.java     |  2 ++
 .../api/service/impl/DepartmentServiceImpl.java        |  7 ++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java b/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java
index bf6fdb3..ecbb541 100644
--- a/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java
+++ b/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java
@@ -11,8 +11,8 @@ import xyz.playedu.api.request.backend.DepartmentRequest;
 import xyz.playedu.api.service.DepartmentService;
 import xyz.playedu.api.types.JsonResponse;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Author 杭州白书科技有限公司
@@ -31,7 +31,11 @@ public class DepartmentController {
 
     @GetMapping("/index")
     public JsonResponse index() {
-        List<Department> data = departmentService.list();
+        Map<Integer, List<Department>> departments = departmentService.all().stream().collect(Collectors.groupingBy(Department::getParentId));
+
+        HashMap<String, Object> data = new HashMap<>();
+        data.put("departments", departments);
+
         return JsonResponse.data(data);
     }
 
diff --git a/src/main/java/xyz/playedu/api/service/DepartmentService.java b/src/main/java/xyz/playedu/api/service/DepartmentService.java
index 1c4610f..88d45a5 100644
--- a/src/main/java/xyz/playedu/api/service/DepartmentService.java
+++ b/src/main/java/xyz/playedu/api/service/DepartmentService.java
@@ -15,6 +15,8 @@ public interface DepartmentService extends IService<Department> {
 
     List<Department> listByParentId(Integer id);
 
+    List<Department> all();
+
     Department findOrFail(Integer id) throws NotFoundException;
 
     void deleteById(Integer id) throws NotFoundException;
diff --git a/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java
index e985cc9..0ef35d5 100644
--- a/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java
@@ -27,7 +27,12 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
     @Override
     public List<Department> listByParentId(Integer id) {
-        return list(query().getWrapper().eq("parent_id", id));
+        return list(query().getWrapper().eq("parent_id", id).orderByAsc("sort"));
+    }
+
+    @Override
+    public List<Department> all() {
+        return list(query().getWrapper().orderByAsc("sort"));
     }
 
     @Override