From 43a8037b60150b65651c03fd654621d37075d051 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 18:00:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
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