From fd3f8cb9239a6ba0d8ed0a861e5e352f88ee405a Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 16 Mar 2020 23:25:19 +0000
Subject: [PATCH]

---
 server/AyaNova/PickList/PickListSqlBuilder.cs | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/server/AyaNova/PickList/PickListSqlBuilder.cs b/server/AyaNova/PickList/PickListSqlBuilder.cs
index a36abab0..8d4d97cc 100644
--- a/server/AyaNova/PickList/PickListSqlBuilder.cs
+++ b/server/AyaNova/PickList/PickListSqlBuilder.cs
@@ -30,7 +30,7 @@ namespace AyaNova.PickList
 
             string PlIdSelectFragment = string.Empty;
             string ActiveSelectFragment = string.Empty;
-            string ActiveWhereFragment = string.Empty;          
+            string ActiveWhereFragment = string.Empty;
             string TagSpecificWhereFragment = string.Empty;
 
             //PROCESS ROW ID "VALUE" COLUMN 
@@ -73,10 +73,11 @@ namespace AyaNova.PickList
 
             //PROCESS TAG SPECIFIC QUERY
             //
-            if(HasTagSpecificQuery){               
+            if (HasTagSpecificQuery)
+            {
                 //get the tag column
-                 AyaPickListFieldDefinition tagColumn = pickList.ColumnDefinitions.FirstOrDefault(x => x.ColumnDataType == UiFieldDataType.Tags);
-              TagSpecificWhereFragment=$"(array_to_string({tagColumn.GetSqlValueColumnName()},',') like '%{tagSpecificQuery}%')";
+                AyaPickListFieldDefinition tagColumn = pickList.ColumnDefinitions.FirstOrDefault(x => x.ColumnDataType == UiFieldDataType.Tags);
+                TagSpecificWhereFragment = $"(array_to_string({tagColumn.GetSqlValueColumnName()},',') like '%{tagSpecificQuery}%')";
             }
 
 
@@ -183,6 +184,13 @@ namespace AyaNova.PickList
 
             //WHERE           
             sb.Append(" where ");
+
+            if (HasTagSpecificQuery)
+            {
+                sb.Append(TagSpecificWhereFragment);
+                sb.Append(" and (");
+            }
+
             if (!IncludeInactive)
             {
                 sb.Append(ActiveWhereFragment);
@@ -197,6 +205,12 @@ namespace AyaNova.PickList
             //clear trailing or
             sb.Length -= 4;
             //enclosing parenthesis
+
+            if (HasTagSpecificQuery)
+            {
+                sb.Append(")");
+            }
+
             if (!IncludeInactive)
             {
                 sb.Append(")");