| 
					
				 | 
			
			
				@ -174,7 +174,10 @@ public class UserService extends BaseJpaService<UserDO, UserDao> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        UserDO user = userDao.findOne(id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        RoleDO role = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (user != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (user != null ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if(!user.getEnabled()){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                throw new Exception("用户已失效!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            userinfo.put("id", user.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            userinfo.put("name", user.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            role = roleDao.findOne(user.getRoleId()); 
			 |