This commit is contained in:
msyu
2024-10-25 15:29:39 +03:00
parent 152532bc37
commit 2492fdf7a2
4 changed files with 65 additions and 5 deletions
+7 -3
View File
@@ -82,7 +82,6 @@
join usr u on (k.contragent_id=u.contragent_id)
join svc v on (e.service_id=v.svc_id)
where u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/>
--AND exists(select * from usr_role x where u.usr_id=x.usr_id AND x.role_id=2)
<m:filter_build filter=#filter#/>
order by <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/><!---no sort length limit--->
limit #maxrows#
@@ -91,8 +90,13 @@
<cfquery name="local.qTotal">
select count(*) as cnt
from instance e
where 1=1
--AND exists(select * from usr_role x where u.usr_id=x.usr_id AND x.role_id=2) -- 2=Согласование нарядов
join specification_item i on (e.specification_item_id=i.specification_item_id)
join specification s on (i.specification_id=s.specification_id)
join contract d on (s.contract_id=d.contract_id)
join contragent k on (d.contragent_id=k.contragent_id)
join usr u on (k.contragent_id=u.contragent_id)
join svc v on (e.service_id=v.svc_id)
where u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/>
</cfquery>
<cfset var out=structNew("linked")/>