优化ltv模型账户过滤条件

models/x_analysis.py

@@ -260,10 +260,11 @@ class XAnalysis:
             qry = sa.select().where(*where_account)
             sql = str(qry.compile(compile_kwargs={"literal_binds": True}))
             where_account_str = sql.split('WHERE ')[1]
+            if "AND" in where_account_str:
+                where_account_str = where_account_str.split('AND')[1]
+            else:
                 if "orderid" in where_account_str:
                     where_account_str = "1=1"
-            else:
-                where_account_str = where_account_str.split('AND')[0]
         if self.game == 'huixie' and quota == '#distinct_id':
             event_n='new_device'
         else: