From 80e5ee8049eefe7039d77048f43e6e0566a07953 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 三月 2024 09:10:43 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java
index 92bd052..b082623 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java
@@ -87,7 +87,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.userId);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -96,7 +96,7 @@
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
if (!Cools.isEmpty(host)){
- return String.valueOf(host.getId());
+ return String.valueOf(host.getName());
}
return null;
}
--
Gitblit v1.9.1