From 18080d68a84f2c0ae317f4473c80b1ec492e5fd4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 18 七月 2025 15:35:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index f9d53fa..6073321 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -463,6 +463,9 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
if (!Cools.isEmpty(user)){
+ if(Cools.isEmpty(user.getNickname())){
+ return String.valueOf(user.getUsername());
+ }
return String.valueOf(user.getNickname());
}
return null;
--
Gitblit v1.9.1