错提代码

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()));
     }
 
     /**