Просмотр исходного кода

修复导入用户时无法更新存在用户数据的问题

RuoYi лет назад: 3
Родитель
Сommit
81a8192de7

+ 5 - 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -501,17 +501,18 @@ public class SysUserServiceImpl implements ISysUserService
501
                     BeanValidators.validateWithException(validator, user);
501
                     BeanValidators.validateWithException(validator, user);
502
                     user.setPassword(SecurityUtils.encryptPassword(password));
502
                     user.setPassword(SecurityUtils.encryptPassword(password));
503
                     user.setCreateBy(operName);
503
                     user.setCreateBy(operName);
504
-                    this.insertUser(user);
504
+                    userMapper.insertUser(user);
505
                     successNum++;
505
                     successNum++;
506
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
506
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
507
                 }
507
                 }
508
                 else if (isUpdateSupport)
508
                 else if (isUpdateSupport)
509
                 {
509
                 {
510
                     BeanValidators.validateWithException(validator, user);
510
                     BeanValidators.validateWithException(validator, user);
511
-                    checkUserAllowed(user);
512
-                    checkUserDataScope(user.getUserId());
511
+                    checkUserAllowed(u);
512
+                    checkUserDataScope(u.getUserId());
513
+                    user.setUserId(u.getUserId());
513
                     user.setUpdateBy(operName);
514
                     user.setUpdateBy(operName);
514
-                    this.updateUser(user);
515
+                    userMapper.updateUser(user);
515
                     successNum++;
516
                     successNum++;
516
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
517
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
517
                 }
518
                 }