备份

Model/Database/PriCondition.cs

@@ -115,6 +115,13 @@ namespace Model
         public decimal prizeAmount { get; set; }
 
 
+        /// <summary>
+        /// 分组
+        /// </summary>
+        [SugarColumn(ColumnDescription = "分组", Length = 20, ColumnName = "group_no")]
+        public string? groupNo { get; set; }
+
+
 
     }
 }

Model/Database/PriRecursionStartCondition.cs

@@ -122,6 +122,13 @@ namespace Model
         public int startIndex { get; set; }
 
 
+        /// <summary>
+        /// 分组
+        /// </summary>
+        [SugarColumn(ColumnDescription = "分组", Length = 20, ColumnName = "group_no")]
+        public string? groupNo { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriConditionQueryVo.cs

@@ -61,6 +61,12 @@ namespace Vo.Admin
         public decimal prizeAmount { get; set; }
 
 
+        /// <summary>
+        /// 分组
+        /// </summary>
+        public string groupNo { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriRecursionStartConditionQueryVo.cs

@@ -67,6 +67,12 @@ namespace Vo.Admin
         public int startIndex { get; set; }
 
 
+        /// <summary>
+        /// 分组
+        /// </summary>
+        public string groupNo { get; set; }
+
+
 
     }
 }

Util/PrizeDo.cs

@@ -1428,14 +1428,14 @@ namespace Util
                     checkObj = GetQueryTableData(condiDic, returnFieldId);
                     checkTitle = GetQueryTableTitle(condiDic, returnFieldId);
                 }
-                if(!sub.recursionFlag)
-                {
+                // if(!sub.recursionFlag)
+                // {
                     logStepDic.Add("标题", checkTitle);
                     logStepDic.Add("匹配条件", getQueryKind(fieldQueryKind));
                     logStepDic.Add("匹配方式", getQueryModel(fieldQueryModel));
                     logStepDic.Add("匹配值", fieldQueryValue);
                     logStepDic.Add("实际值", checkObj);
-                }
+                // }
 
                 string checkVal = fieldQueryValue;
                 bool passFlag = false;