From ba638747dff57a546fc533caee528a81fecf6c00 Mon Sep 17 00:00:00 2001
From: heshunme <heshunme@outlook.com>
Date: Fri, 5 Jul 2024 20:21:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E9=94=AE=E7=BA=A6=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TenantManagementController.java    |  3 +--
 .../cmh/backend/UserManagement/model/Tenant.java  | 15 ++++++++++-----
 .../service/TenantManagementService.java          |  3 +--
 3 files changed, 12 insertions(+), 9 deletions(-)

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<Tenant> getAll() {
-        List<Tenant> 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<Tenant> findAll(){