|  | @@ -501,17 +501,18 @@ public class SysUserServiceImpl implements ISysUserService
 | 
											
												
													
														|  |                      BeanValidators.validateWithException(validator, user);
 |  |                      BeanValidators.validateWithException(validator, user);
 | 
											
												
													
														|  |                      user.setPassword(SecurityUtils.encryptPassword(password));
 |  |                      user.setPassword(SecurityUtils.encryptPassword(password));
 | 
											
												
													
														|  |                      user.setCreateBy(operName);
 |  |                      user.setCreateBy(operName);
 | 
											
												
													
														|  | -                    this.insertUser(user);
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    userMapper.insertUser(user);
 | 
											
												
													
														|  |                      successNum++;
 |  |                      successNum++;
 | 
											
												
													
														|  |                      successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
 |  |                      successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
 | 
											
												
													
														|  |                  }
 |  |                  }
 | 
											
												
													
														|  |                  else if (isUpdateSupport)
 |  |                  else if (isUpdateSupport)
 | 
											
												
													
														|  |                  {
 |  |                  {
 | 
											
												
													
														|  |                      BeanValidators.validateWithException(validator, user);
 |  |                      BeanValidators.validateWithException(validator, user);
 | 
											
												
													
														|  | -                    checkUserAllowed(user);
 |  | 
 | 
											
												
													
														|  | -                    checkUserDataScope(user.getUserId());
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    checkUserAllowed(u);
 | 
											
												
													
														|  | 
 |  | +                    checkUserDataScope(u.getUserId());
 | 
											
												
													
														|  | 
 |  | +                    user.setUserId(u.getUserId());
 | 
											
												
													
														|  |                      user.setUpdateBy(operName);
 |  |                      user.setUpdateBy(operName);
 | 
											
												
													
														|  | -                    this.updateUser(user);
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    userMapper.updateUser(user);
 | 
											
												
													
														|  |                      successNum++;
 |  |                      successNum++;
 | 
											
												
													
														|  |                      successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
 |  |                      successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
 | 
											
												
													
														|  |                  }
 |  |                  }
 |