From 8a1bfb496c1b272a0c73128572bcda47954efb28 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 15 Mar 2022 15:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E6=8F=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/MemoAttrController.java  | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java
index 8a8c3f557e..07b1ed3eb6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java
@@ -12,9 +12,6 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.MemoAttrDTO;
 import com.epmet.dto.form.MemosToRemindFormDTO;
-import com.epmet.dto.form.ProjectByCreateTopicUserFormDTO;
-import com.epmet.dto.form.ShiftProjectFormDTO;
-import com.epmet.dto.result.IssueProjectResultDTO;
 import com.epmet.dto.result.MemosToRemindResultDTO;
 import com.epmet.service.MemoAttrService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,10 +77,8 @@ public class MemoAttrController {
      * @Description 书记日志-待提醒弹框-提醒内容列表
      **/
     @PostMapping("memosToRemind")
-    public Result<List<MemosToRemindResultDTO>> memosToRemind(@RequestBody MemosToRemindFormDTO formDTO) {
-    //public Result<List<MemosToRemindResultDTO>> memosToRemind(@LoginUser TokenDto tokenDTO, @RequestBody MemosToRemindFormDTO formDTO) {
-        //formDTO.setUserId(tokenDTO.getUserId());
-        formDTO.setUserId("111");
+    public Result<List<MemosToRemindResultDTO>> memosToRemind(@LoginUser TokenDto tokenDTO, @RequestBody MemosToRemindFormDTO formDTO) {
+        formDTO.setUserId(tokenDTO.getUserId());
         return new Result<List<MemosToRemindResultDTO>>().ok(memoAttrService.memosToRemind(formDTO));
     }
 
@@ -92,10 +87,8 @@ public class MemoAttrController {
      * @Description 书记日志-待提醒时间列表
      **/
     @PostMapping("memoTime")
-    public Result<List<String>> memoTime() {
-        return new Result<List<String>>().ok(memoAttrService.memoTime("111"));
-    /*public Result<List<String>> memoTime(@LoginUser TokenDto tokenDTO) {
-        return new Result<List<String>>().ok(memoAttrService.memoTime(tokenDTO.getUserId()));*/
+    public Result<List<String>> memoTime(@LoginUser TokenDto tokenDTO) {
+        return new Result<List<String>>().ok(memoAttrService.memoTime(tokenDTO.getUserId()));
     }
 
     /**