diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java
index f54f420294..eb0e559e74 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java
@@ -149,7 +149,8 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 		QueryWrapper<UserMessageEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
 				.eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId)
-				.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId)
+//				注释掉此列，居民端和工作端消息浮窗看到的是当前客户下所有的消息
+//				.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId)
 				.eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId)
 				.eq(StringUtils.isNotBlank(deFlag), FieldConstant.DEL_FLAG, deFlag)
 				.eq(StringUtils.isNotBlank(readFlag), "read_flag", readFlag);