From d1d3ca6f708ec971c6d9e9c2804f2f53c45d8a00 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 10 二月 2025 17:01:03 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java | 17 +++++++++++++++++
rsf-admin/src/i18n/zh.js | 1 +
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/src/page/tenant/TenantList.jsx | 1 +
4 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index e356675..f6d8b77 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -135,6 +135,7 @@
tenant: {
name: "name",
flag: "flag",
+ root: "root",
},
role: {
name: "name",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 9490a9c..8ce6aa2 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -135,6 +135,7 @@
tenant: {
name: "绉熸埛鍚�",
flag: "浠ｇ爜",
+ root: "绠＄悊鍛�",
},
role: {
name: "瑙掕壊鍚嶇О",
diff --git a/rsf-admin/src/page/tenant/TenantList.jsx b/rsf-admin/src/page/tenant/TenantList.jsx
index ac2d782..e4d2164 100644
--- a/rsf-admin/src/page/tenant/TenantList.jsx
+++ b/rsf-admin/src/page/tenant/TenantList.jsx
@@ -113,6 +113,7 @@
<NumberField source="id" />
<TextField source="name" label="table.field.tenant.name" />
<TextField source="flag" label="table.field.tenant.flag" />
+ {/* <TextField source="root$" label="table.field.tenant.root" /> */}
<DateField source="updateTime" label="common.field.updateTime" showTime />
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
index d2edd1e..1e05343 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -38,6 +40,12 @@
private String flag;
/**
+ * 绠＄悊鍛�
+ */
+ @ApiModelProperty(value= "绠＄悊鍛�")
+ private Long root;
+
+ /**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
@@ -68,6 +76,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ public String getRoot$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.root);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
public Boolean getStatusBool(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1