From 98d33bd648770ce2f81a25d5fb16ead6610e3774 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 17 七月 2025 10:39:43 +0800
Subject: [PATCH] #pda支持取消组托

---
 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