|  | @@ -27,20 +27,22 @@ public class LoginService {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      public ResultVo<UserPojo> login(UserPojo userPojo) {
 | 
	
		
			
				|  |  | -        UserPojo tempUserPojo = dao.findUserByCodeRs(userPojo.getCodeRs());
 | 
	
		
			
				|  |  | +        UserPojo tempUserPojo = dao.findUserByCodeRsFromDjUserBase(userPojo.getCodeRs());
 | 
	
		
			
				|  |  |          if (null == tempUserPojo) {
 | 
	
		
			
				|  |  | -            return ResultVoUtil.fail(ExceptionEnum.USER_NOT_EXIST);
 | 
	
		
			
				|  |  | -        } else {
 | 
	
		
			
				|  |  | -            if (!userPojo.getPassword().equals(tempUserPojo.getPassword())) {
 | 
	
		
			
				|  |  | -                return ResultVoUtil.fail(ExceptionEnum.INVALID_PASSWORD);
 | 
	
		
			
				|  |  | -            } else {
 | 
	
		
			
				|  |  | -                String token = tokenService.getToken(tempUserPojo);
 | 
	
		
			
				|  |  | -                tempUserPojo.setToken(token);
 | 
	
		
			
				|  |  | -                tempUserPojo.setSid(makeSid(tempUserPojo.getCode(), token));
 | 
	
		
			
				|  |  | -                tempUserPojo.setRoles(dao.getUserRoles(tempUserPojo.getCode()));
 | 
	
		
			
				|  |  | -                return ResultVoUtil.success(tempUserPojo);
 | 
	
		
			
				|  |  | +            tempUserPojo = dao.findUserByCodeRsFromAEmployeeMi(userPojo.getCodeRs());
 | 
	
		
			
				|  |  | +            if (null == tempUserPojo) {
 | 
	
		
			
				|  |  | +                return ResultVoUtil.fail(ExceptionEnum.USER_NOT_EXIST);
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  | +            dao.insertNewUserToDjUserBase(tempUserPojo);
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +        if (!userPojo.getPassword().equals(tempUserPojo.getPassword())) {
 | 
	
		
			
				|  |  | +            return ResultVoUtil.fail(ExceptionEnum.INVALID_PASSWORD);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | +        String token = tokenService.getToken(tempUserPojo);
 | 
	
		
			
				|  |  | +        tempUserPojo.setToken(token);
 | 
	
		
			
				|  |  | +        tempUserPojo.setSid(makeSid(tempUserPojo.getCode(), token));
 | 
	
		
			
				|  |  | +        tempUserPojo.setRoles(dao.getUserRoles(tempUserPojo.getCode()));
 | 
	
		
			
				|  |  | +        return ResultVoUtil.success(tempUserPojo);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      public ResultVo<List<String>> getMenus() {
 |