From 0330592c7cdd52a507bfe8b992de2aaf977e3b4c Mon Sep 17 00:00:00 2001 From: sunflower2014 Date: Tue, 9 Sep 2025 17:07:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reference/admin/controller/NewsController.java | 13 +++++++++++-- .../jinrui/reference/core/mapper/NewsMapper.java | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/admin/src/main/java/com/jinrui/reference/admin/controller/NewsController.java b/admin/src/main/java/com/jinrui/reference/admin/controller/NewsController.java index 8280dcd..fcb7c3a 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/controller/NewsController.java +++ b/admin/src/main/java/com/jinrui/reference/admin/controller/NewsController.java @@ -342,7 +342,8 @@ public class NewsController { @RequestParam(value = "dateline_from", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date datelineFrom, @RequestParam(value = "dateline_to", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date datelineTo, @RequestParam(value = "deleted", required = false) Integer deleted, - @RequestParam(value = "rating", required = false) Byte rating + @RequestParam(value = "rating", required = false) Byte rating, + @RequestParam(value = "range", required = false, defaultValue = "all") String range ) { if (!StringUtils.hasText(token)) { return PageObject.failedPage("登陆Token为空!"); @@ -363,7 +364,15 @@ public class NewsController { log.info("path: /news, method: GET, request user id: {}, keyword: {}, column: {}, status: {}, " + "page: {}, size: {}, last: {}, current: {}, orderBy: {}, tag: {}, industry: {}", adminUser.getId(), keyword, columnList, status, page, size, last, current, orderBy, tag, industry); - return newsService.queryNews(keyword, columnList, status, page, size, last, current, orderBy, minScore, maxScore, tag, industry, mediaId, datelineFrom, datelineTo, deleted, rating, adminUser.isReviewer()); + + boolean isReviewRange = false; + if ("review".equals(range)) { + if (!adminUser.isReviewer()) { + return PageObject.failedPage(500, "非审核员用户查看范围权限!"); + } + isReviewRange = true; + } + return newsService.queryNews(keyword, columnList, status, page, size, last, current, orderBy, minScore, maxScore, tag, industry, mediaId, datelineFrom, datelineTo, deleted, rating, isReviewRange); } catch (Exception e) { log.error("解析登陆Token出错!", e); return PageObject.failedPage(500, "服务端错误,请联系系统管理员!"); diff --git a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java index 098f078..70dc78d 100644 --- a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java +++ b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java @@ -77,7 +77,7 @@ public interface NewsMapper { void saveNews(News news); @Select("