Merge remote-tracking branch 'origin/dev_memo' into develop

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java

@@ -71,9 +71,9 @@ public class MemoConcernServiceImpl extends BaseServiceImpl<MemoConcernDao, Memo
         }
         //更新阅读状态
         if (NumConstant.ONE_STR.equals(formDTO.getReadFlag())) {
-            MemoAttrDTO memoAttrDTO = new MemoAttrDTO();
+            MemoAttrDTO memoAttrDTO = memoAttrService.get(formDTO.getId());
-            memoAttrDTO.setId(formDTO.getId());
             memoAttrDTO.setReadFlag(NumConstant.ONE);
+            memoAttrDTO.setUpdatedTime(null);
             memoAttrService.update(memoAttrDTO);
         }
         return dto;

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java

@@ -71,9 +71,9 @@ public class MemoWorkDiaryServiceImpl extends BaseServiceImpl<MemoWorkDiaryDao,
         }
         //更新阅读状态
         if (NumConstant.ONE_STR.equals(formDTO.getReadFlag())) {
-            MemoAttrDTO memoAttrDTO = new MemoAttrDTO();
+            MemoAttrDTO memoAttrDTO = memoAttrService.get(formDTO.getId());
-            memoAttrDTO.setId(formDTO.getId());
             memoAttrDTO.setReadFlag(NumConstant.ONE);
+            memoAttrDTO.setUpdatedTime(null);
             memoAttrService.update(memoAttrDTO);
         }
         return dto;