From c3c2a68482646726b508b60ff04fc4a0b7da25ab Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 29 Apr 2021 15:08:28 +0800
Subject: [PATCH] =?UTF-8?q?bug=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    | 6 +++---
 1 file changed, 3 insertions(+), 3 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 ba58278c76..d4025dcd6f 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
@@ -143,7 +143,7 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
         NoticeEntity notice = noticeDao.selectById(formDTO.getNoticeId());
         //已经过期的通知，新用户阅读只修改过期后的阅读状态
         boolean bl = true;
-        if (notice.getChangeTime().before(new Date())) {
+        if (notice.getExpirationTime().before(new Date())) {
             //通知过期
             bl = false;
         }
@@ -165,13 +165,13 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
         } else {
             //4.根据是否过期判断已存在记录且是已读状态不在修改
             if (bl) {
-                if (ReadFlagConstant.UN_READ.equals(entity.getReadFlag())) {
+                if ("un_read".equals(entity.getReadFlag())) {
                     entity.setReadFlag(ReadFlagConstant.READ);
                     entity.setViewDetail(ReadFlagConstant.READ);
                     baseDao.updateById(entity);
                 }
             } else {
-                if (ReadFlagConstant.UN_READ.equals(entity.getViewDetail())) {
+                if ("un_read".equals(entity.getViewDetail())) {
                     entity.setViewDetail(ReadFlagConstant.READ);
                     baseDao.updateById(entity);
                 }