Merge branch 'dev'

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);
                 }