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