Merge branch 'fu-dev' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceReceiveServiceImpl.java

@@ -297,12 +297,7 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
         Map<String, String> userNameToNickNameMap = allUsers.stream()
                 .collect(Collectors.toMap(SysUser::getUserName, SysUser::getNickName));
 
-        // 保存消息内容
-        Integer contentId = saveMessageContent(mceRequestVO, userIdToUserMap);
-        if (contentId == null) {
-            log.error("消息内容保存失败，用户: {}", mceRequestVO.getUserName());
-            return;
-        }
+
 
         // 筛选目标用户
         List<Long> targetUserIds = mceRequestVO.getUserIds();
@@ -362,6 +357,13 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                 return;
             }
 
+            // 保存消息内容
+            Integer contentId = saveMessageContent(mceRequestVO, userIdToUserMap);
+            if (contentId == null) {
+                log.error("消息内容保存失败，用户: {}", mceRequestVO.getUserName());
+                return;
+            }
+
             // 创建消息接收记录
             MceReceive mceReceive = createMceReceive(user, contentId, mceRequestVO, userNameToNickNameMap);
             boolean saveResult = this.save(mceReceive);