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

application-webadmin/src/main/java/com/tourism/webadmin/ws/handle/SystemMessageHandler.java

@@ -334,7 +334,7 @@ public class SystemMessageHandler extends AbstractWebSocketHandler {
 
         messageDTO.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
         //1.群聊 2.单聊
-        if ((Objects.equals(messageDTO.getNoticeType(), NoticeType.GROUP) || (Objects.equals(messageDTO.getNoticeType(), NoticeType.PERSONAL))) && Objects.equals(messageDTO.getMessageType(), 0) &&!StringUtils.isBlank(messageDTO.getMessageContent())){
+        if ((Objects.equals(messageDTO.getNoticeType(), NoticeType.GROUP.getCode()) || (Objects.equals(messageDTO.getNoticeType(), NoticeType.SYSTEM.getCode()))) && Objects.equals(messageDTO.getMessageType(), 0) &&!StringUtils.isBlank(messageDTO.getMessageContent())){
             String replace = sensitiveWordBs.replace(messageDTO.getMessageContent());
             messageDTO.setMessageContent(replace);
         }