1

api/api_v1/endpoints/xquery.py

@@ -32,7 +32,7 @@ async def ltv_model_sql(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """ ltv模型sql """
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     data = analysis.ltv_model_sql()
     return schemas.Msg(code=0, msg='ok', data=[data])
 
@@ -46,7 +46,7 @@ async def ltv_model_sql(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """ ltv模型sql """
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
 
     res = analysis.ltv_model_sql()
     sql = res['sql']
@@ -76,7 +76,7 @@ async def ltv_model_export(request: Request,
                            current_user: schemas.UserDB = Depends(deps.get_current_user)
                            ):
     """ ltv分析 数据导出"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     data = analysis.ltv_model_sql()
     file_name = quote(f'lvt.xlsx')
     mime = mimetypes.guess_type(file_name)[0]

models/x_analysis.py

@@ -29,7 +29,7 @@ class XAnalysis:
     def _get_global_filters(self):
         return self.event_view.get('filts') or []
 
-    async def init(self):
+    async def init(self,*args, **kwargs):
         if self.data_in.report_id:
             db = get_database()
             report = await crud.report.get(db, id=self.data_in.report_id)
@@ -52,6 +52,9 @@ class XAnalysis:
             self.events = self.data_in.events
 
         self.global_filters = self._get_global_filters()
+        # 用户自带过滤
+        if 'data_where' in kwargs:
+            self.global_filters.extend(kwargs['data_where'].get(self.game, []))
 
     def handler_filts(self):
         where = []