From 776191c0049359dca1a35a0770fc46fed0b12fe8 Mon Sep 17 00:00:00 2001 From: guoxin <371864209@qq.com> Date: Sun, 17 Sep 2023 18:18:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shandan/control/controller/FIleRepairController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shandan-control/src/main/java/com/keyware/shandan/control/controller/FIleRepairController.java b/shandan-control/src/main/java/com/keyware/shandan/control/controller/FIleRepairController.java index f5011ac..58488ac 100644 --- a/shandan-control/src/main/java/com/keyware/shandan/control/controller/FIleRepairController.java +++ b/shandan-control/src/main/java/com/keyware/shandan/control/controller/FIleRepairController.java @@ -11,6 +11,7 @@ import com.keyware.shandan.frame.properties.CustomProperties; import com.keyware.shandan.system.entity.SysFile; import com.keyware.shandan.system.entity.SysFileChunk; import com.keyware.shandan.system.entity.SysSetting; +import com.keyware.shandan.system.entity.SysUser; import com.keyware.shandan.system.service.SysFileService; import com.keyware.shandan.system.service.SysUserService; import com.keyware.shandan.system.utils.FileChunkUploadUtil; @@ -76,7 +77,8 @@ public class FIleRepairController { data.put("fileType", file.getFileType()); data.put("fileSize", file.getFileSize()); data.put("createTime", DateUtil.format(file.getModifyTime(), "yyyy-MM-dd HH:mm")); - data.put("createUser", userService.getById(file.getModifyUser()).getUserName()); + SysUser user = userService.getById(file.getModifyUser()); + data.put("createUser", user == null ? file.getModifyUser() : user.getUserName()); fileMap.put(file.getId(), data); } }