改！

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);

src/main/java/org/cmh/backend/UserManagement/adpter/UserHS2User.java

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 public class UserHS2User {
     public static User convert(UserHS userHS) {
         User user = new User();
+        user.setId(userHS.getId());
         user.setAccount(userHS.getUsername());
         user.setPassword(userHS.getPassword());
         user.setName(userHS.getNickname());

src/main/java/org/cmh/backend/UserManagement/controller/UserController.java

@@ -1,39 +0,0 @@
-package org.cmh.backend.UserManagement.controller;
-
-import org.cmh.backend.UserManagement.model.User;
-import org.cmh.backend.UserManagement.service.UserServiceTemp;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-import static org.springframework.http.ResponseEntity.ok;
-
-@RestController
-public class UserController {
-
-    @Autowired
-    private UserServiceTemp userService;
-    @CrossOrigin(origins = "http://localhost:5173")
-    @PostMapping("/checkLogin")
-    public ResponseEntity<User> login(@RequestBody Map<String,String> credentials) {
-        String account = credentials.get("account");
-        String password = credentials.get("password");
-
-        User user = userService.getUserByAccountAndPassword(account, password);
-        return ok(user);
-
-    }
-    @CrossOrigin(origins = "http://localhost:5173")
-    @PostMapping("/checkRegister")
-    public String register(@RequestBody User user) {
-
-        if(userService.registerUser(user) != null){
-            return "注册成功";
-        }else
-            return "注册错误";
-    }
-
-
-}

src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java

@@ -1,22 +1,22 @@
 package org.cmh.backend.UserManagement.controller;
 
-import io.jsonwebtoken.JwtParser;
 import jakarta.transaction.Transactional;
 import org.cmh.backend.OrganizationManagement.service.OrganizationService;
 import org.cmh.backend.UserManagement.adpter.User2UserHS;
 import org.cmh.backend.UserManagement.adpter.UserHS2User;
-import org.cmh.backend.UserManagement.service.UserManagementService;
 import org.cmh.backend.UserManagement.model.User;
+import org.cmh.backend.UserManagement.service.UserManagementService;
 import org.cmh.backend.Utils.JwtUtil;
 import org.cmh.backend.Utils.JwtVerify;
 import org.cmh.backend.authentication.dto.UserProfileResponse;
 import org.cmh.backend.authentication.model.UserHS;
+import org.cmh.backend.authentication.repository.UserRepository;
 import org.cmh.backend.authentication.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 @RestController
@@ -28,6 +28,8 @@ public class UserManagementController {
     private OrganizationService organizationService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private UserRepository userRepository;
 
     @PostMapping("/addUser")
     public ResponseEntity<UserProfileResponse> addUser(@RequestBody User user) {
@@ -42,10 +44,10 @@ public class UserManagementController {
                 newuser.getRole(),
                 newuser.getCreatedAt()
         );
-        if(organizationService.getByName(newuser.getDepartment()) != null){
+        if (organizationService.getByName(newuser.getDepartment()) != null) {
             userService.addUser(newuser);
             return new ResponseEntity<>(response, HttpStatus.OK);
-        }else{
+        } else {
             return null;
         }
     }
@@ -56,45 +58,50 @@ public class UserManagementController {
     public List<User> getAll(@RequestParam String token) {
         String username = JwtUtil.extractUsername(token);
         UserHS userHS = userService.getUserByUsername(username);
-        List<UserHS> userHSList = userService.getAllUsers();
+        if (userHS.getSuperAdmin()) {
-        //这里分权限进行不同请求
+            return UserHS2User.convertList(userService.getAllUsers());
-        //超级管理员
+        } else {
-        if(userHS.getSuperAdmin()){
+            return UserHS2User.convertList(userService.getUsersByTenant(userHS.getTenant()));
-            return UserHS2User.convertList(userHSList);
-        }else{
-            return null;
         }
     }
 
 
     @PostMapping("/update")
     public ResponseEntity<UserProfileResponse> update(@RequestBody User user) {
-        UserHS newuser = User2UserHS.convert(user);
+        UserHS reqUser = User2UserHS.convert(user);
-        UserProfileResponse response = new UserProfileResponse(
+        UserHS tarUser = userService.getUserByUsername(reqUser.getUsername());
-                newuser.getUsername(),
+        if (tarUser != null) {
-                newuser.getNickname(),
+            tarUser.setNickname(reqUser.getNickname());
-                newuser.getGender(),
+            tarUser.setGender(reqUser.getGender());
-                newuser.getPhoneNumber(),
+            tarUser.setPhoneNumber(reqUser.getPhoneNumber());
-                newuser.getEmail(),
+            tarUser.setEmail(reqUser.getEmail());
-                newuser.getDepartment(),
+            tarUser.setRole(reqUser.getRole());
-                newuser.getRole(),
+            UserProfileResponse response = new UserProfileResponse(
-                newuser.getCreatedAt()
+                    reqUser.getUsername(),
-        );
+                    reqUser.getNickname(),
-        if(organizationService.getByName(newuser.getDepartment()) != null){
+                    reqUser.getGender(),
-            userService.addUser(newuser);
+                    reqUser.getPhoneNumber(),
+                    reqUser.getEmail(),
+                    reqUser.getDepartment(),
+                    reqUser.getRole(),
+                    reqUser.getCreatedAt()
+            );
+            if (organizationService.getByName(reqUser.getDepartment()) != null) {
+                tarUser.setDepartment(reqUser.getDepartment());
+            }
+            userRepository.save(tarUser);
             return new ResponseEntity<>(response, HttpStatus.OK);
-        }else{
+        } else {
-            return null;
+            return new ResponseEntity<>(null, HttpStatus.OK);
         }
     }
 
 
     @PostMapping("/delete")
     @Transactional
-    //不确定这里返回值应该是什么
     public void delete(@RequestBody User user) {
         UserHS userHS = userService.getUserByUsername(user.getName());
-        if(userHS != null){
+        if (userHS != null) {
             //根据用户名删除用户
             userService.deleteUser(userHS.getUsername());
         }