Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -915,7 +915,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
         }
 		
         // 查询最新协议模板
-		TenantContractTemplate tenantContractTemplate = tenantContractTemplateService.queryLatestContractTemplate(TenantContextHolder.getTenantId(), null, null);
+		TenantContractTemplate tenantContractTemplate = tenantContractTemplateService.queryLatestContractTemplate(user.getTenantId(), null, null);
 		if(tenantContractTemplate == null){
 			logger.error("最新协议模板查询失败");
 			return;
@@ -1078,7 +1078,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			}
 		}
 		
-		TenantContractTemplate tenantContractTemplate = tenantContractTemplateService.queryLatestContractTemplate(TenantContextHolder.getTenantId(), null, null);
+		TenantContractTemplate tenantContractTemplate = tenantContractTemplateService.queryLatestContractTemplate(studentInfo.getTenantId(), null, null);
 		if(tenantContractTemplate == null){
 			throw new BizException("最新协议模板查询失败");
 		}