|  | @@ -226,7 +226,7 @@ public class SysUserController extends BaseController {
 | 
	
		
			
				|  |  |                  informationByUserId = new SysUserInformation();
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              SysUser sysUser = userService.selectUserById(userId);
 | 
	
		
			
				|  |  | -            sysUser.setOrgId(sysUser.getOriginalOrgId());
 | 
	
		
			
				|  |  | +//            sysUser.setOrgId(sysUser.getOriginalOrgId());
 | 
	
		
			
				|  |  |              List<SysUserRole> userRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("user_id", userId));
 | 
	
		
			
				|  |  |              sysUser.setRoles(roles);
 | 
	
		
			
				|  |  |              String sex = "-";
 | 
	
	
		
			
				|  | @@ -274,7 +274,7 @@ public class SysUserController extends BaseController {
 | 
	
		
			
				|  |  |          final String salt = SecurityUtils.salt();
 | 
	
		
			
				|  |  |          user.setSalt(salt);
 | 
	
		
			
				|  |  |          user.setPassword(SecurityUtils.encryptPassword(user.getPassword(), salt));
 | 
	
		
			
				|  |  | -        user.setOriginalOrgId(user.getOrgId());
 | 
	
		
			
				|  |  | +        //user.setOriginalOrgId(user.getOrgId());
 | 
	
		
			
				|  |  |          userService.insertUser(user);
 | 
	
		
			
				|  |  |          return AjaxResult.success();
 | 
	
		
			
				|  |  |      }
 | 
	
	
		
			
				|  | @@ -311,7 +311,7 @@ public class SysUserController extends BaseController {
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        user.setOriginalOrgId(user.getOrgId());
 | 
	
		
			
				|  |  | +//        user.setOriginalOrgId(user.getOrgId());
 | 
	
		
			
				|  |  |          user.setUpdateBy(SecurityUtils.getUsername());
 | 
	
		
			
				|  |  |          return toAjax(userService.updateUser(user));
 | 
	
		
			
				|  |  |      }
 |