From 012590ca2c7aebef2c42dbfb6b9a8b286d8181fb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 17 二月 2024 17:04:53 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
index 7fe7403..0cd193d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.system.service.DeptService;
import com.zy.asrs.wcs.system.service.HostService;
import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -247,14 +248,14 @@
}
}
-// public String getDeptId$(){
-// DeptService service = SpringUtils.getBean(DeptService.class);
-// Dept dept = service.getById(this.deptId);
-// if (!Cools.isEmpty(dept)){
-// return String.valueOf(dept.getName());
-// }
-// return null;
-// }
+ public String getDeptId$(){
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.getById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return String.valueOf(dept.getName());
+ }
+ return null;
+ }
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
@@ -300,7 +301,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -316,7 +317,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
--
Gitblit v1.9.1