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> memosToRemind(@RequestBody MemosToRemindFormDTO formDTO) { - //public Result> memosToRemind(@LoginUser TokenDto tokenDTO, @RequestBody MemosToRemindFormDTO formDTO) { - //formDTO.setUserId(tokenDTO.getUserId()); - formDTO.setUserId("111"); + public Result> memosToRemind(@LoginUser TokenDto tokenDTO, @RequestBody MemosToRemindFormDTO formDTO) { + formDTO.setUserId(tokenDTO.getUserId()); return new Result>().ok(memoAttrService.memosToRemind(formDTO)); } @@ -92,10 +87,8 @@ public class MemoAttrController { * @Description 书记日志-待提醒时间列表 **/ @PostMapping("memoTime") - public Result> memoTime() { - return new Result>().ok(memoAttrService.memoTime("111")); - /*public Result> memoTime(@LoginUser TokenDto tokenDTO) { - return new Result>().ok(memoAttrService.memoTime(tokenDTO.getUserId()));*/ + public Result> memoTime(@LoginUser TokenDto tokenDTO) { + return new Result>().ok(memoAttrService.memoTime(tokenDTO.getUserId())); } /**