From bb1f07248d7a7aafcd172ce3f78b91d0caf82d8f Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 14 二月 2025 11:32:56 +0800
Subject: [PATCH] bug修改

---
 huaxin_client/l2_data_manager.py |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/huaxin_client/l2_data_manager.py b/huaxin_client/l2_data_manager.py
index a2a2818..ed7bba8 100644
--- a/huaxin_client/l2_data_manager.py
+++ b/huaxin_client/l2_data_manager.py
@@ -68,23 +68,21 @@
             if item[2] >= filter_condition[0][0]:
                 return item
             # 1鎵嬬殑涔板崟婊¤冻浠锋牸
-            if item[2] == 100 and abs(filter_condition[0][2] - item[1]) < 0.001:
-                return item
+            # if item[2] == 100 and abs(filter_condition[0][2] - item[1]) < 0.001:
+            #     return item
             # 涔伴噺
             if item[2] == filter_condition[0][3]:
                 return item
 
-            # 鍗栧ぇ浜�2w涓旀槸娑ㄥ仠鍗�
-            # if item[3] != '1' and item[2] > filter_condition[0][4] and item[1] == filter_condition[0][1]:
-            #     return item
-
             # 鎵�鏈夌殑娑ㄥ仠鍗�
-            if item[1] == filter_condition[0][1]:
-                if item[3] != '1':
-                    # 娑ㄥ仠鍗�
+            if item[3] != '1':
+                # 鍗栦笌鍗栨挙
+                if abs(item[1] - filter_condition[0][1]) < 0.001:
+                    # 娑ㄥ仠浠�
                     return item
-                elif item[2] in filter_condition[0][5]:
-                    # 娑ㄥ仠婊¤冻鐗规畩鐨勬墜鏁�
+            else:
+                if item[2] in filter_condition[0][5]:
+                    # 鐗规畩鎵嬫暟
                     return item
             return None
         return item

--
Gitblit v1.8.0