From c9ee2c3e9cbb1dfa61e7a1a36f152fe1fd4cbb37 Mon Sep 17 00:00:00 2001
From: sol <bgasolyang@gmail.com>
Date: Tue, 17 Mar 2026 17:15:21 +0800
Subject: [PATCH] fix(message): add null check for user ids in message envelope
 service

---
 .../message/service/MessageEnvelopeService.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cloud/common/common-base-web/src/main/java/com/bgasol/common/message/service/MessageEnvelopeService.java b/cloud/common/common-base-web/src/main/java/com/bgasol/common/message/service/MessageEnvelopeService.java
index 0689acc..46df525 100644
--- a/cloud/common/common-base-web/src/main/java/com/bgasol/common/message/service/MessageEnvelopeService.java
+++ b/cloud/common/common-base-web/src/main/java/com/bgasol/common/message/service/MessageEnvelopeService.java
@@ -46,12 +46,14 @@ public class MessageEnvelopeService extends BaseService<MessageEnvelopeEntity<?>
                 .map(MessageEnvelopeEntity::getUserId)
                 .filter(ObjectUtils::isNotEmpty)
                 .collect(Collectors.toSet());
-        Map<String, UserEntity> userEntityMap = userApi.findByIds(String.join(",", userIds)).getData().stream().collect(Collectors.toMap(UserEntity::getId, Function.identity()));
-        list.forEach(e -> {
-            if (ObjectUtils.isNotEmpty(e.getUserId())) {
-                e.setUser(userEntityMap.get(e.getUserId()));
-            }
-        });
+        if (ObjectUtils.isNotEmpty(userIds)) {
+            Map<String, UserEntity> userEntityMap = userApi.findByIds(String.join(",", userIds)).getData().stream().collect(Collectors.toMap(UserEntity::getId, Function.identity()));
+            list.forEach(e -> {
+                if (ObjectUtils.isNotEmpty(e.getUserId())) {
+                    e.setUser(userEntityMap.get(e.getUserId()));
+                }
+            });
+        }
         super.findOtherTable(list);
     }