|
|
|
@ -9,7 +9,6 @@ import com.baiye.modules.security.service.OnlineUserService;
|
|
|
|
|
import com.baiye.modules.system.domain.Company;
|
|
|
|
|
import com.baiye.modules.system.repository.CompanyRepository;
|
|
|
|
|
import com.baiye.modules.system.repository.UserRepository;
|
|
|
|
|
|
|
|
|
|
import com.baiye.modules.system.service.AgentService;
|
|
|
|
|
import com.baiye.modules.system.service.CompanyService;
|
|
|
|
|
import com.baiye.modules.system.service.dto.CompanyDto;
|
|
|
|
@ -19,7 +18,6 @@ import com.baiye.util.PageUtil;
|
|
|
|
|
import com.baiye.util.QueryHelp;
|
|
|
|
|
import com.baiye.util.SecurityUtils;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
|
|
import org.springframework.data.domain.Page;
|
|
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
|
@ -50,7 +48,7 @@ public class CompanyServiceImpl implements CompanyService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public CompanyDto updateCompany(CompanyDto companyDto) throws Exception {
|
|
|
|
|
public CompanyDto userUpdateCompany(CompanyDto companyDto) throws Exception {
|
|
|
|
|
Long companyId = SecurityUtils.getCompanyId();
|
|
|
|
|
if (companyId != null) {
|
|
|
|
|
Company byUserId = companyRepository.findById(companyId).orElseGet(Company::new);
|
|
|
|
@ -86,7 +84,7 @@ public class CompanyServiceImpl implements CompanyService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Cacheable(cacheNames = "companyCache",key = "#companyId")
|
|
|
|
|
@Cacheable(cacheNames = "companyCache", key = "#companyId")
|
|
|
|
|
public Company findById(Long companyId) {
|
|
|
|
|
return companyRepository.findById(companyId).orElseGet(Company::new);
|
|
|
|
|
}
|
|
|
|
@ -112,4 +110,19 @@ public class CompanyServiceImpl implements CompanyService {
|
|
|
|
|
}
|
|
|
|
|
companyRepository.updateCompanyStatus(id, status);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void updateCompany(CompanyDto companyDto) {
|
|
|
|
|
Long id = companyDto.getId();
|
|
|
|
|
if (id != null) {
|
|
|
|
|
Company byUserId = companyRepository.findById(id).orElseGet(Company::new);
|
|
|
|
|
if (byUserId == null) {
|
|
|
|
|
throw new EntityExistException
|
|
|
|
|
(Company.class, "companyName", companyDto.getCompanyName());
|
|
|
|
|
}
|
|
|
|
|
BeanUtil.copyProperties(companyDto, byUserId);
|
|
|
|
|
byUserId.setXGroup(companyDto.getAxbGroup());
|
|
|
|
|
companyRepository.save(byUserId);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|