Merge branch 'fix/permission-version-react' of https://github.com/Tea…

…mDMU/DMU-Android into fix/permission-version-react
TeamDMU · Apr 21, 2024 · 5830f42 · 5830f42
2 parents 6f49322 + 8cdcdc6
commit 5830f42
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaViewModel.kt
@@ -67,11 +67,13 @@ class CafeteriaViewModel(
     fun updateMenuList(selectedDate: LocalDate) {
         val cafeteriaList = _cafeteriaList.value ?: emptyList()
         _selectedDate.value = selectedDate
+        val selectedMenu = cafeteriaList.find { it.date == selectedDate.toString() }?.menus
         _menus.postValue(
-            cafeteriaList.find { it.date == selectedDate.toString() }?.menus
-                .takeIf { it.isNullOrEmpty() }
-                ?.let { emptyMenu }
-                ?: cafeteriaList.find { it.date == selectedDate.toString() }?.menus
+            if (selectedMenu.isNullOrEmpty()) {
+                emptyMenu
+            } else {
+                selectedMenu
+            }
         )
     }
 }