From d0b145d2e6fac8ed7f9d6ad84c1be5b6ebf9f2b8 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 27 Dec 2022 16:44:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=86=E7=BA=A7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/model/DeptRepository.java  | 2 +-
 src/main/resources/templates/admin/department_input.ftl | 2 +-
 src/main/resources/templates/admin/department_list.ftl  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/DeptRepository.java b/src/main/java/cn/palmte/work/model/DeptRepository.java
index 2a5aa05..623692d 100644
--- a/src/main/java/cn/palmte/work/model/DeptRepository.java
+++ b/src/main/java/cn/palmte/work/model/DeptRepository.java
@@ -15,6 +15,6 @@ public interface DeptRepository extends JpaRepository<Dept,Integer> {
     @Query(value = "select * from dept where enabled = 1", nativeQuery = true)
     List<Dept> findEnable();
 
-    @Query(value = "select * from dept where enabled = 1 and level <= 2", nativeQuery = true)
+    @Query(value = "select * from dept where enabled = 1 and level <= 2 order by case when level = 1 then id else parent_id end, parent_id", nativeQuery = true)
     List<Dept> findEnableParent();
 }
diff --git a/src/main/resources/templates/admin/department_input.ftl b/src/main/resources/templates/admin/department_input.ftl
index 37a1459..81bdbb2 100644
--- a/src/main/resources/templates/admin/department_input.ftl
+++ b/src/main/resources/templates/admin/department_input.ftl
@@ -45,7 +45,7 @@
                                         <#if parentList??>
                                             <#list parentList as parent>
                                                 <option value="${parent.id!}" <#if department.parentId == parent.id >
-                                                selected </#if>>${parent.name}</option>
+                                                selected </#if>><#if parent.level gt 1>--</#if>${parent.name}</option>
                                             </#list>
                                         </#if>
                                     </select>
diff --git a/src/main/resources/templates/admin/department_list.ftl b/src/main/resources/templates/admin/department_list.ftl
index 40d4002..5706475 100644
--- a/src/main/resources/templates/admin/department_list.ftl
+++ b/src/main/resources/templates/admin/department_list.ftl
@@ -42,7 +42,7 @@
                                         <#if parentList??>
                                             <#list parentList as parent>
                                                 <option value="${parent.id!}" <#if parentId! == parent.id + "" >
-                                                selected </#if>>${parent.name}</option>
+                                                selected </#if>><#if parent.level gt 1>--</#if>${parent.name}</option>
                                             </#list>
                                         </#if>
                                     </select>