From f51a66073b64a2e4f48452170e5d9db6374fc81d Mon Sep 17 00:00:00 2001
From: heshunme <heshunme@outlook.com>
Date: Sat, 6 Jul 2024 06:15:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84tenant=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NewsManagement/service/NewsService.java   | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java b/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java
index 5674812..1c53100 100644
--- a/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java
+++ b/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java
@@ -73,6 +73,11 @@ public class NewsService {
 
 
     public void createNews(NewsRequest request) {
+        String username = JwtUtil.extractUsername(request.getToken());
+        UserHS user = userService.getUserByUsername(username);
+        if (!user.getSuperAdmin() && !user.getTenant().equals(request.getTenant())){
+            throw new IllegalArgumentException("只能在自己的租户的名下新增新闻！");
+        }
         News news = new News();
         news.setTitle(request.getTitle());
         news.setSummary(request.getSummary());
@@ -91,7 +96,9 @@ public class NewsService {
             news.setContent(request.getContent());
             news.setAuthor(request.getAuthor());
             news.setImagePath(request.getImagePath());
-            news.setTenant(request.getTenant());
+            if (userService.getUserByUsername(JwtUtil.extractUsername(request.getToken())).getSuperAdmin()) {
+                news.setTenant(request.getTenant());
+            }
             newsRepository.save(news);
         }
     }
@@ -114,26 +121,6 @@ public class NewsService {
         return newsRepository.count();
     }
 
-    // TODO:完善用户权限
-//    public List<News> searchNews(SearchNewsRequest request) {
-//        String username = JwtUtil.extractUsername(request.getToken());
-//        UserHS user = userService.getUserByUsername(username);
-//        if (user.getSuperAdmin()) {
-//            return newsRepository.findByTitleContainingOrSummaryContainingOrAuthorContainingOrImagePathContaining(
-//                    request.getTitle(),
-//                    request.getSummary(),
-//                    request.getAuthor(),
-//                    request.getImagePath()
-//            );
-//        }
-//        return newsRepository.findByTitleContainingOrSummaryContainingOrAuthorContainingOrImagePathContainingAndTenantEquals(
-//                request.getTitle(),
-//                request.getSummary(),
-//                request.getAuthor(),
-//                request.getImagePath(),
-//                user.getUsername()
-//        );
-//    }
     public List<News> searchNews(SearchNewsRequest request) {
         String username = JwtUtil.extractUsername(request.getToken());
         UserHS user = userService.getUserByUsername(username);