From 6ab7c7f7c135edf2253d70e2cdceaa8a32334adf Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 17 Jun 2021 15:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/service/impl/NoticeReadRecordServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
index 51684f9648..f7c93c7f0f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
@@ -166,13 +166,13 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
         } else {
             //4.根据是否过期判断已存在记录且是已读状态不在修改
             if (bl) {
-                if ("un_read".equals(entity.getReadFlag()) && null != entity) {
+                if (null != entity && "un_read".equals(entity.getReadFlag())) {
                     entity.setReadFlag(ReadFlagConstant.READ);
                     entity.setViewDetail(ReadFlagConstant.READ);
                     baseDao.updateById(entity);
                 }
             } else {
-                if ("un_read".equals(entity.getViewDetail()) && null != entity) {
+                if (null != entity && "un_read".equals(entity.getViewDetail())) {
                     entity.setViewDetail(ReadFlagConstant.READ);
                     baseDao.updateById(entity);
                 }