|  | @@ -209,19 +209,8 @@ public class SysUserController extends BaseController {
 | 
											
												
													
														|  |          final String salt = SaltHelper.salt();
 |  |          final String salt = SaltHelper.salt();
 | 
											
												
													
														|  |          user.setSalt(salt);
 |  |          user.setSalt(salt);
 | 
											
												
													
														|  |          user.setPassword(SaltHelper.exec(user.getPassword(), salt));
 |  |          user.setPassword(SaltHelper.exec(user.getPassword(), salt));
 | 
											
												
													
														|  | 
 |  | +        user.setOriginalOrgId(user.getOrgId());
 | 
											
												
													
														|  |          userService.insertUser(user);
 |  |          userService.insertUser(user);
 | 
											
												
													
														|  | -//        if (user.getId()!=null&&user.getRoleIds()!=null&&user.getRoleIds().length > 0) {
 |  | 
 | 
											
												
													
														|  | -//            for (Long roleId :
 |  | 
 | 
											
												
													
														|  | -//                    user.getRoleIds()) {
 |  | 
 | 
											
												
													
														|  | -//                SysUserRole sysUserRole = new SysUserRole();
 |  | 
 | 
											
												
													
														|  | -//                sysUserRole.setUserId(user.getId());
 |  | 
 | 
											
												
													
														|  | -//                sysUserRole.setRoleId(roleId);
 |  | 
 | 
											
												
													
														|  | -//                sysUserRoleService.insertSysUserRole(sysUserRole);
 |  | 
 | 
											
												
													
														|  | -//            }
 |  | 
 | 
											
												
													
														|  | -//
 |  | 
 | 
											
												
													
														|  | -//        }
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -//        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
 |  | 
 | 
											
												
													
														|  |          return AjaxResult.success();
 |  |          return AjaxResult.success();
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -239,10 +228,7 @@ public class SysUserController extends BaseController {
 | 
											
												
													
														|  |          } else if (StringUtils.isNotEmpty(user.getPhone()) && !userService.checkPhoneUnique(user)) {
 |  |          } else if (StringUtils.isNotEmpty(user.getPhone()) && !userService.checkPhoneUnique(user)) {
 | 
											
												
													
														|  |              return error("修改用户'" + user.getUsername() + "'失败,手机号码已存在");
 |  |              return error("修改用户'" + user.getUsername() + "'失败,手机号码已存在");
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -//        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
 |  | 
 | 
											
												
													
														|  | -//        {
 |  | 
 | 
											
												
													
														|  | -//            return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
 |  | 
 | 
											
												
													
														|  | -//        }
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |          if (user.getRoleIds() != null && user.getRoleIds().length > 0) {
 |  |          if (user.getRoleIds() != null && user.getRoleIds().length > 0) {
 | 
											
												
													
														|  |              sysUserRoleService.remove(new QueryWrapper<SysUserRole>().eq("user_id", user.getId()));
 |  |              sysUserRoleService.remove(new QueryWrapper<SysUserRole>().eq("user_id", user.getId()));
 | 
											
												
													
														|  |              for (Long roleId :
 |  |              for (Long roleId :
 |