Resolved conflicts

src/main/java/net/gepafin/tendermanagement/service/CompanyService.java

@@ -31,7 +31,9 @@ public interface CompanyService {
 	CompanyEntity validateCompany(Long companyId);
 
 	UserWithCompanyEntity validateUserWithCompny(Long userId, Long companyId);
-
+	
+	UserWithCompanyEntity getUserWithCompany(Long userId, Long companyId);
+	
 	ByteArrayOutputStream downloadCompanyDelegation(HttpServletRequest request, Long companyId, CompanyDelegationRequest companyDelegationRequest);
 
 	CompanyDelegationResponse uploadCompanyDelegation(HttpServletRequest request, Long companyId, MultipartFile file);

src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java

@@ -80,7 +80,7 @@ public class ApplicationServiceImpl implements ApplicationService {
     public NextOrPreviousFormResponse getNextOrPreviousForm(HttpServletRequest request, Long applicationId, Long formId,
     		FormActionEnum action) {
     	ApplicationEntity applicationEntity = validateApplication(applicationId);
-    	validator.validateUserWithCompany(request, applicationEntity.getCompany().getId());
+    	validator.validateUserWithCompany(request, applicationEntity.getCompanyId());
     	return flowFormDao.getNextOrPreviousForm(applicationEntity, formId, action);
     }
 

src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java

@@ -90,7 +90,10 @@ public class CompanyServiceImpl implements CompanyService {
 	public UserWithCompanyEntity validateUserWithCompny(Long userId, Long companyId) {
 		return companyDao.validateUserWithCompny(userId, companyId);
 	}
-	
+	@Override
+	public UserWithCompanyEntity getUserWithCompany(Long userId, Long companyId) {
+		return companyDao.getUserWithCompany(userId, companyId);
+	}
 	@Override
 	@Transactional(readOnly = true)
 	public ByteArrayOutputStream downloadCompanyDelegation(HttpServletRequest request, Long companyId, CompanyDelegationRequest companyDelegationRequest) {