From ee2eb2ffdff8ccd92f9c200b1ccfac763923d408 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Mon, 21 Apr 2025 12:53:42 +0300
Subject: [PATCH] resourceRealm refactoring debug3 094

---
 v1/Application.cfc                      | 2 +-
 v1/resources/instance_operation_run.cfc | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/v1/Application.cfc b/v1/Application.cfc
index 04f0689..dbac184 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -51,7 +51,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="Deck API";
-		variables.framework.docs.APIVersion="0.093";
+		variables.framework.docs.APIVersion="0.094";
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
diff --git a/v1/resources/instance_operation_run.cfc b/v1/resources/instance_operation_run.cfc
index 9542471..85463bb 100644
--- a/v1/resources/instance_operation_run.cfc
+++ b/v1/resources/instance_operation_run.cfc
@@ -375,10 +375,11 @@
 			
 		<!--- пробегаемся по CFS параметрам данной операции--->
 		<cfquery name="local.qCheckResourceRealmAccess">
-			select r.resource_realm_id, r.resource_realm, iop.param, iop.param_value, a.contract_id, a.is_enabled
-			from resource_realm r 
+			select r.resource_realm_id, r.resource_realm, sop.svc_operation_cfs_param, iop.param_value, a.contract_id, a.is_enabled
+			from instance_operation_cfs_param iop
+			join svc_operation_cfs_param sop on (iop.svc_operation_cfs_param_id=sop.svc_operation_cfs_param_id)
+			join resource_realm r on (sop.svc_operation_cfs_param='resourceRealm' AND iop.param_value=r.resource_realm)
 			join resource_realm_access a on (r.resource_realm_id=a.resource_realm_id)
-			join instance_operation_cfs_param iop on (r.resource_realm=iop.param_value AND iop.param='resourceRealm')
 			where iop.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationUid#" null=#!isValid("guid",arguments.instanceOperationUid)#/> 
 			AND (a.contract_id=<cfqueryparam cfsqltype="CF_SQL_INTEGER" value=#local.qContract.contract_id# null=#!isValid("integer",local.qContract.contract_id)#/> OR a.contract_id=0)
 			AND a.is_enabled