resolved conficts

This commit is contained in:
rajesh
2024-10-11 10:22:16 +05:30
8 changed files with 50 additions and 8 deletions

View File

@@ -39,5 +39,7 @@ public interface CompanyService {
CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId);
void deleteCompanyDelegation(HttpServletRequest request, Long companyId);
UserWithCompanyEntity getUserWithCompanyEntity(Long userId,Long companyId);
}

View File

@@ -114,4 +114,7 @@ public class CompanyServiceImpl implements CompanyService {
UserEntity userEntity =validator.validateUser(request);
delegationDao.deleteCompanyDelegation(userEntity, companyId);
}
public UserWithCompanyEntity getUserWithCompanyEntity(Long userId,Long companyId){
return companyDao.getUserWithCompany(userId,companyId);
}
}