From 95010d4a4c21cd53b78f51cbd518a315a8861fbc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 12 十月 2022 10:55:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java
index d016ddb..c53bebc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java
@@ -62,7 +62,9 @@
successNum++;
successMsg.append("<br/>").append(successNum).append("銆佽处鍙� ").append(user.getUserName()).append(" 瀵煎叆鎴愬姛");
} else if (isUpdateSupport) {
+ Long userId = user.getUserId();
user = BeanUtil.toBean(userVo, SysUser.class);
+ user.setUserId(userId);
ValidatorUtils.validate(user);
user.setUpdateBy(operName);
userService.updateUser(user);
--
Gitblit v1.9.3