039 added svc_short
This commit is contained in:
@@ -300,7 +300,7 @@
|
||||
<cfset var local={}/>
|
||||
|
||||
<cfquery name="local.qSvc">
|
||||
select svc from svc where svc_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.service_id#/>
|
||||
select coalesce(svc_short,svc) as svc_short from svc where svc_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.service_id#/>
|
||||
</cfquery>
|
||||
|
||||
<cfquery name="local.qInst">
|
||||
@@ -312,11 +312,11 @@
|
||||
join contragent k on (d.contragent_id=k.contragent_id)
|
||||
join usr u on (k.contragent_id=u.contragent_id)
|
||||
where u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usr_id#/>
|
||||
AND lower(e.display_name) like lower(<cfqueryparam cfsqltype="cf_sql_varchar" value="#local.qSvc.svc#%"/>)
|
||||
AND lower(e.display_name) like lower(<cfqueryparam cfsqltype="cf_sql_varchar" value="#local.qSvc.svc_short#%"/>)
|
||||
AND service_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.service_id#/>
|
||||
</cfquery>
|
||||
|
||||
<cfset var prefixLen=len(local.qSvc.svc)+1/>
|
||||
<cfset var prefixLen=len(local.qSvc.svc_short)+1/>
|
||||
<cfset var i=1/>
|
||||
<cfloop query="local.qInst">
|
||||
<cfif len(local.qInst.display_name) GT prefixLen>
|
||||
@@ -327,7 +327,7 @@
|
||||
</cfif>
|
||||
</cfloop>
|
||||
|
||||
<cfreturn "#local.qSvc.svc#-#i+1#"/>
|
||||
<cfreturn "#local.qSvc.svc_short#-#i+1#"/>
|
||||
</cffunction>
|
||||
|
||||
</cfcomponent>
|
||||
Reference in New Issue
Block a user