|
@@ -982,14 +982,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
|
|
|
//如果分部有企业信息,就用分部上的企业信息,否则用机构上的企业信息
|
|
|
String companyName = null;
|
|
|
- TenantInfo tenantInfo = null;
|
|
|
+ TenantInfo tenantInfo = tenantInfoService.get(studentInfo.getTenantId());;
|
|
|
Organization organizationDto = organizationService.get(user.getOrganId());
|
|
|
if (organizationDto == null || StringUtils.isBlank(organizationDto.getCorporateName()) || StringUtils.isBlank(organizationDto.getCorporateCode())) {
|
|
|
-
|
|
|
- tenantInfo = tenantInfoService.get(studentInfo.getTenantId());
|
|
|
- if (tenantInfo == null) {
|
|
|
- throw new BizException("机构信息不存在");
|
|
|
- }
|
|
|
companyName = tenantInfo.getTsignName();
|
|
|
} else {
|
|
|
companyName = organizationDto.getCorporateName();
|