diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index f296f0c8..a5b302c0 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -3099,13 +3099,17 @@ public class RetrofitClient {
                 if (response.code() == 200) {
                     BaseModel<RoomGiftData> data = response.body();
                     if (data.getCode() == 1) {
-                        if (data.getData().getCp_type() != null) {
-                            if (cpListener != null) {
-                                cpListener.onSendCpMsg(data.getData());
+                        if (data.getData()!=null) {
+                            if (data.getData().getCp_type() != null) {
+                                if (cpListener != null) {
+                                    cpListener.onSendCpMsg(data.getData());
+                                }
                             }
-                        }
-                        observer.onNext(data.getData());
 
+                            observer.onNext(data.getData());//2025年11月25日09:10:54，服务端修改，应该是都不能等于null
+                        }else {
+                            observer.onNext(new RoomGiftData());//这里添加这个，是预防报错
+                        }
                     } else if (data.getCode() == 0) {
                         ToastUtils.showShort(data.getMsg());
                     } else if (data.getCode() == 301) {