diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java index 1049378..033d235 100644 --- a/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java +++ b/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java @@ -24,8 +24,7 @@ public class TenantManagementController { @CrossOrigin(origins = "http://localhost:5173") @GetMapping("/getAllTenant") public List getAll() { - List tenantList=tenantManagementService.findAll(); - return tenantList; + return tenantManagementService.findAll(); } @CrossOrigin(origins = "http://localhost:5173") diff --git a/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java b/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java index ceb2ce9..db433c6 100644 --- a/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java +++ b/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java @@ -4,6 +4,7 @@ package org.cmh.backend.UserManagement.model; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; +import org.cmh.backend.authentication.model.UserHS; @Entity @Getter @@ -13,9 +14,13 @@ public class Tenant { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private String contact; - private String phone; - private String name; - private String manager; - private String symbol; + private String contact; // 联系人 + private String phone; // 联系人电话 + private String name; // 租户名称 + private String manager; // 租户管理员 + + @OneToOne + @JoinColumn(name = "manager", referencedColumnName = "username", insertable = false, updatable = false) + private UserHS managerEntity; // 租户管理员对象 + private String symbol; // 租户标识 } diff --git a/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java b/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java index f52e511..8767b59 100644 --- a/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java +++ b/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java @@ -13,8 +13,7 @@ public class TenantManagementService { private TenantManagementRepository tenantManagementRepository; public Tenant registerTenant(Tenant tenant) { - Tenant savedTenant = tenantManagementRepository.save(tenant); - return savedTenant; + return tenantManagementRepository.save(tenant); } public List findAll(){