diff --git a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt index 1e44803..b9d3a41 100644 --- a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt +++ b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt @@ -500,9 +500,8 @@ open class ProjectsService( open fun allBuildingTypes(): List { val sortedBuildingType = buildingTypeRepository.findAll().sortedBy { it.name }.sortedWith { a, b -> when { - a.contains("Hidden", ignoreCase = true) && !b.contains("Hidden", ignoreCase = true) -> 2 a.startsWith("Others") && !b.startsWith("Others") -> 1 // Move "Others" to the end - (!a.startsWith("Others") && b.startsWith("Others")) || (!a.contains("Hidden", ignoreCase = true) && b.contains("Hidden", ignoreCase = true)) -> -1 // Keep non-"Others" items above + (!a.startsWith("Others") && b.startsWith("Others")) -> -1 // Keep non-"Others" items above else -> 0 // Maintain relative order for other items } }