src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java

@@ -1,12 +1,16 @@
 package org.cmh.backend.OrganizationManagement.controller;
 
+import org.aspectj.weaver.ast.Or;
 import org.cmh.backend.OrganizationManagement.model.Organization;
 import org.cmh.backend.OrganizationManagement.service.OrganizationService;
+import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.authentication.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

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

@@ -2,19 +2,18 @@ package org.cmh.backend.UserManagement.controller;
 
 import jakarta.transaction.Transactional;
 import org.cmh.backend.UserManagement.model.Tenant;
-import org.cmh.backend.UserManagement.model.User;
 import org.cmh.backend.UserManagement.service.TenantManagementService;
+import org.cmh.backend.UserManagement.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 @RestController
-@RequestMapping("/tenant")
 public class TenantManagementController {
     @Autowired
     private TenantManagementService tenantManagementService;
 
+    @CrossOrigin(origins = "http://localhost:5173")
     @PostMapping("/addTenant")
     public Tenant addTenant(@RequestBody Tenant tenant) {
         Tenant tenant1=tenantManagementService.registerTenant(tenant);
@@ -22,11 +21,13 @@ public class TenantManagementController {
         return tenant1;
     }
 
+    @CrossOrigin(origins = "http://localhost:5173")
     @GetMapping("/getAllTenant")
     public List<Tenant> getAll() {
         return tenantManagementService.findAll();
     }
 
+    @CrossOrigin(origins = "http://localhost:5173")
     @PostMapping("/updateTenant")
     public Tenant update(@RequestBody Tenant tenant) {
         System.out.println(tenant);
@@ -34,6 +35,7 @@ public class TenantManagementController {
         return tenant;
     }
 
+    @CrossOrigin(origins = "http://localhost:5173")
     @PostMapping("/deleteTenant")
     @Transactional
     public void delete(@RequestBody User user) {

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

@@ -1,16 +1,13 @@
 package org.cmh.backend.UserManagement.controller;
 
 import jakarta.transaction.Transactional;
-import org.cmh.backend.UserManagement.model.User;
 import org.cmh.backend.UserManagement.service.UserManagementService;
+import org.cmh.backend.UserManagement.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 @RestController
-@RequestMapping("/user")
 public class UserManagementController {
     @Autowired
     private UserManagementService userManagementService;
@@ -45,15 +42,9 @@ public class UserManagementController {
     @CrossOrigin(origins = "http://localhost:5173")
     @PostMapping("/delete")
     @Transactional
-    public ResponseEntity<String> delete(@RequestBody User user) {
+    public void delete(@RequestBody User user) {
         System.out.println(user);
-        try{
         userManagementService.delete(user.getId());
-            return ResponseEntity.ok("请求成功");
-        }
-        catch (Exception e){
-            return ResponseEntity.badRequest().body("删除失败");
-        }
     }
 
 }

src/main/java/org/cmh/backend/UserManagement/model/User.java

@@ -8,18 +8,32 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
+public class User {
     @Setter
     @Getter
-public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+    @Setter
+    @Getter
     private String account;
+    @Setter
+    @Getter
     private String password;
+    @Setter
+    @Getter
     private String name;
+    @Getter
+    @Setter
     private String organization;
+    @Setter
+    @Getter
     private String gender;
+    @Setter
+    @Getter
     private String email;
+    @Getter
+    @Setter
     private String phone;
 
     public User() {
@@ -34,6 +48,7 @@ public class User {
         this.gender = gender;
         this.email = email;
         this.phone = phone;
+
     }
 
     @Override