From da8a535959c72cf61cf904f3dffaa1d0bd33b79f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 11 七月 2025 10:43:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkMast.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..6f35eb9 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -446,7 +446,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;
     }
@@ -481,12 +484,12 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
     }
 
-    public void setErrorMemo(String errorMemo) {
-        if (errorMemo.length() > 255) {
-            errorMemo = errorMemo.substring(0, 150);
-        }
-        this.errorMemo = errorMemo;
-    }
+//    public void setErrorMemo(String errorMemo) {
+//        if (errorMemo.length() > 255) {
+//            errorMemo = errorMemo.substring(0, 150);
+//        }
+//        this.errorMemo = errorMemo;
+//    }
 
     public String getLogErrTime$(){
         if (Cools.isEmpty(this.logErrTime)){

--
Gitblit v1.9.1