|
@@ -4,6 +4,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
+import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.system.domain.SysNoticeUser;
|
|
|
import com.ruoyi.system.service.ISysNoticeUserService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -111,20 +112,20 @@ public class SysNoticeController extends BaseController
|
|
|
/*
|
|
|
标记为已读
|
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('system:notice:choose')")
|
|
|
@Log(title = "标记为已读", businessType = BusinessType.UPDATE)
|
|
|
- @PostMapping("/setIsRead")
|
|
|
+ @PostMapping(value ="/setIsRead")
|
|
|
public AjaxResult setIsRead(@Validated @RequestBody SysNoticeUser notice)
|
|
|
{
|
|
|
notice.setStatus("1");//已读
|
|
|
-
|
|
|
+ notice.setUpdateTime(DateUtils.getNowDate());
|
|
|
+ notice.setUpdateBy(getUsername());
|
|
|
return toAjax(noticeUserService.updateNoticeUser(notice));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取通知公告用户列表
|
|
|
*/
|
|
|
- @GetMapping("/listUser")
|
|
|
+ @GetMapping(value ="/listUser")
|
|
|
public TableDataInfo listUser(SysNoticeUser notice)
|
|
|
{
|
|
|
startPage();
|
|
@@ -153,11 +154,12 @@ public class SysNoticeController extends BaseController
|
|
|
/**
|
|
|
* 获取通知公告用户列表
|
|
|
*/
|
|
|
- @GetMapping("/myNoticeList")
|
|
|
+ @GetMapping(value ="/myNoticeList")
|
|
|
public TableDataInfo myNoticeList(SysNoticeUser notice)
|
|
|
{
|
|
|
startPage();
|
|
|
List<Map<String,Object>> list = noticeUserService.selectMyNoticeList(notice);
|
|
|
+
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
}
|