From 11ecb9ee39fc61af04cd8d462faf9dce496d1773 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期四, 11 九月 2025 15:19:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java index e5836a2..28d5d31 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java @@ -29,12 +29,15 @@ @Override public void insertFill(MetaObject metaObject) { // 获取登录信息 - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser().getUser().getNickName(); + Long userId = SecurityUtils.getUserId(); if (StringUtils.isNotBlank(userName)) { this.setFieldValByName("createBy", userName, metaObject); +// this.setFieldValByName("createId", userId, metaObject); this.setFieldValByName("updateBy", userName, metaObject); } else { this.setFieldValByName("createBy", userName, metaObject); +// this.setFieldValByName("createId", userId, metaObject); this.setFieldValByName("updateBy", userName, metaObject); } @@ -48,12 +51,10 @@ @Override public void updateFill(MetaObject metaObject) { // 获取登录信息 - String userName = SecurityUtils.getUsername(); + String userName = SecurityUtils.getLoginUser().getUser().getNickName(); if (StringUtils.isNotBlank(userName)){ - this.setFieldValByName("createBy", userName, metaObject); this.setFieldValByName("updateBy", userName, metaObject); } else { - this.setFieldValByName("createBy", userName, metaObject); this.setFieldValByName("updateBy", userName, metaObject); } -- Gitblit v1.7.1