mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.2.0' into 1.2.0

master
Harry Yang 2022-12-27 16:46:46 +08:00
parent 138f7355f5 af4b89cf02
commit 62f3574609
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/model/DeptRepository.java
View File

@ -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();
}

2
src/main/resources/templates/admin/department_input.ftl
View File

@ -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>

2
src/main/resources/templates/admin/department_list.ftl
View File

@ -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>