From 22439f478a48555016128153ad283c28ae02c5f2 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Thu, 14 Dec 2023 19:12:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85=E5=85=AC=E4=BC=9A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/module_hall/hall/fragment/AssociationRoomFragment.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationRoomFragment.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationRoomFragment.kt
index 7880a4aa7..7a9e2e738 100644
--- a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationRoomFragment.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/fragment/AssociationRoomFragment.kt
@@ -53,7 +53,7 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
             if (!TextUtils.isEmpty(binding.etSearch.text.toString())) {
                 val hallList = list
                 val list = hallList.filter {
-                    it.hallName.contains(binding.etSearch.text.toString()) || it.ownerErbanNo.toString()
+                    (it.hallName != null && it.hallName.contains(binding.etSearch.text.toString())) || it.ownerErbanNo.toString()
                         .contains(binding.etSearch.text.toString())
                 }
                 if (list.isEmpty()) {
@@ -88,7 +88,7 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
                     if (!TextUtils.isEmpty(newStr)) {
                         val hallList = list
                         val list = hallList.filter {
-                            it.hallName.contains(binding.etSearch.text.toString()) || it.ownerErbanNo.toString()
+                            (it.hallName != null && it.hallName.contains(binding.etSearch.text.toString())) || it.ownerErbanNo.toString()
                                 .contains(binding.etSearch.text.toString())
                         }
                         if (list.isEmpty()) {