|
@@ -102,24 +102,22 @@ public class ApiIndexController extends ApiBaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 查看通知公告
|
|
|
+ * 阅读通知公告
|
|
|
*
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
+ @IgnoreAuth
|
|
|
@GetMapping(value = "/viewMessage")
|
|
|
public Result<?> viewMessage(@RequestParam String id) {
|
|
|
- String userId = TokenUtil.getUserId(TokenUtil.getToken(request));
|
|
|
SysAnnouncement announcement = announcementService.getById(id);
|
|
|
|
|
|
- if (!Objects.isNull(announcement)) {
|
|
|
- if (StringUtils.isNotBlank(userId)) {
|
|
|
- //阅读通知公告
|
|
|
- announcementService.readMessage(id, userId);
|
|
|
- }
|
|
|
- return Result.OK(announcement);
|
|
|
+ String userId = TokenUtil.getUserId(TokenUtil.getToken(request));
|
|
|
+ //阅读通知公告
|
|
|
+ if (StringUtils.isNotBlank(userId)) {
|
|
|
+ announcementService.readMessage(id, userId);
|
|
|
}
|
|
|
- return null;
|
|
|
+ return Result.OK(announcement);
|
|
|
}
|
|
|
|
|
|
|