|
@@ -147,9 +147,9 @@ public class ContractFlow extends FlowDelegate {
|
|
|
contract.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
|
|
|
|
|
|
//根据归属公司将数据赋值给指定公司
|
|
|
- Long countryId = contract.getCountryId();
|
|
|
+ Long companyId = contract.getCompanyId();
|
|
|
TenantHolder.setIgnore(true);
|
|
|
- SysDept country = deptService.getById(countryId);
|
|
|
+ SysDept country = deptService.getById(companyId);
|
|
|
TenantHolder.clear();
|
|
|
if (ObjectUtil.isEmpty(country)) {
|
|
|
throw new ServiceException("归属公司不存在");
|
|
@@ -317,14 +317,14 @@ public class ContractFlow extends FlowDelegate {
|
|
|
}
|
|
|
|
|
|
//根据归属公司将数据赋值给指定公司
|
|
|
- Long countryId = contract.getCompanyId();
|
|
|
+ Long companyId = contract.getCompanyId();
|
|
|
TenantHolder.setIgnore(true);
|
|
|
- SysDept country = deptService.getById(countryId);
|
|
|
+ SysDept company = deptService.getById(companyId);
|
|
|
TenantHolder.clear();
|
|
|
- if (ObjectUtil.isEmpty(country)) {
|
|
|
+ if (ObjectUtil.isEmpty(companyId)) {
|
|
|
throw new ServiceException("归属公司不存在");
|
|
|
}
|
|
|
- SecurityUtils.setTenantId(country.getTenantId());
|
|
|
+ SecurityUtils.setTenantId(company.getTenantId());
|
|
|
//保存待采购明细
|
|
|
subscribeDetailService.saveBatch(subscribeDetailList);
|
|
|
SecurityUtils.clearTenantId();
|