Resolved conflicts

This commit is contained in:
rajesh
2024-11-27 17:01:03 +05:30
77 changed files with 3337 additions and 663 deletions

View File

@@ -109,7 +109,7 @@ public class CompanyServiceImpl implements CompanyService {
}
@Override
@Transactional(readOnly = true)
@Transactional
public CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId) {
UserEntity userEntity =validator.validateUser(request);
return delegationDao.getCompanyDelegation(userEntity, companyId);
@@ -117,7 +117,8 @@ public class CompanyServiceImpl implements CompanyService {
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteCompanyDelegation(HttpServletRequest request, Long companyId) {
UserEntity userEntity =validator.validateUser(request);
UserEntity userEntity = validator.validateUser(request);
delegationDao.deleteCompanyDelegation(userEntity, companyId);
}
public UserWithCompanyEntity getUserWithCompanyEntity(Long userId,Long companyId){