From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1

---
 app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
index 2e4ab40..efa9bbd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
@@ -130,7 +130,9 @@
         } else {
             this.mList.clear();
         }
-
+        if (newData == null) {
+            newData = new ArrayList<>();
+        }
         this.mList.addAll(newData);
         notifyDataSetChanged();
     }

--
Gitblit v1.8.0