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 { @Query(value = "select * from dept where enabled = 1", nativeQuery = true) List 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 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> + selected ><#if parent.level gt 1>--${parent.name} 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> + selected ><#if parent.level gt 1>--${parent.name}