修改

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java

@@ -56,11 +56,18 @@ public class MessageServiceImpl implements MessageServiceI {
 		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
 		messageList.stream().forEach(tpMessage -> {
 			//缴费相关信息
-			if (tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_BILL)){
-				TpBill tpBill = tpBillMapper.selectById(tpMessage.getBillId());
-				if (null != tpBill){
-					tpMessage.setContent(tpBill.getBillExplain());
-				}
+			//if (tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_BILL)){
+			//	TpBill tpBill = tpBillMapper.selectById(tpMessage.getBillId());
+			//	if (null != tpBill){
+			//		tpMessage.setContent(tpBill.getBillExplain());
+			//	}
+			//}
+			
+			if(tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_VISITOR) || tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_ANNOUNCEMENT)
+					|| tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_SYS) || tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_BILL)
+					|| tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_ACTIVITY)){
+				tpMessage.setContent(tpMessage.getMessageContent());
+				tpMessage.setMessageContent("");
 			}
 			if (!StringUtils.isEmpty(tpMessage.getMessageDetailUrl())){
 				Integer id = getMessageIdByType(tpMessage);