Merge remote-tracking branch 'origin/saas' into saas

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -1046,6 +1046,12 @@ public class RoomServiceImpl implements RoomService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean display(String roomId, int type, String uri, String targetUserId) throws Exception {
+
+        // 重置uri为空字符串
+        if (StringUtils.isBlank(uri) || "null".equals(uri)) {
+            uri = "";
+        }
+
         SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         log.info("display in room: {}, type = {}, uri = {}", roomId, type, uri);
@@ -1211,7 +1217,7 @@ public class RoomServiceImpl implements RoomService {
             wbmsg.setWhiteboardId(wbId);
             wbmsg.setWhiteboardName(name);
             imHelper.publishMessage(userId, roomId, wbmsg);
-            String display = "display://type=2?userId=" + userId + "?uri=" + wbId;
+            String display = "display://type=2?userId=" + userId + "?uri=" + Optional.ofNullable(wbId).orElse("");
             roomDao.updateDisplayByRid(roomId, display);
 
             RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);