From 51cb803dc3e8e9a98527190f531e6ef9eb2b3616 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 19 八月 2019 17:55:45 +0800
Subject: [PATCH] 对于或规则的一些改进

---
 ruleserver/ruleToformula.go |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index a236fbd..fdc25cd 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -577,14 +577,14 @@
 						var args []*Arg
 						if rule.RuleWithPre == "&&" {
 							args = am.filterData
-							// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
-							am.filterData = am.filterData[0:0]
 							//logger.Info("杩囨护鍚庣殑args鐨勯暱搴︿负锛�",len(args))
 						} else {
 							args = am.args
 							//涓嶆竻绌轰箣鍓嶇殑杩囨护鏁版嵁锛岀户缁
 							//logger.Info("娌¤繃婊ょ殑args鐨勯暱搴︿负锛�",len(args))
 						}
+						// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
+						am.filterData = am.filterData[0:0]
 						//logger.Info("-----------------------浜鸿劯杩囨护鐨刟rgs閲岀殑鏁伴噺锛�", len(args))
 						for _, arg := range args {
 							var formula string

--
Gitblit v1.8.0