1

api/api_v1/authz/authz.py

@@ -33,7 +33,8 @@ async def add_role_domain(
         casbin_enforcer.add_role_for_user_in_domain(user=item.username,
                                                     role=item.role_id,
                                                     domain=item.game)
-    return schemas.Msg(code=0, msg='添加成功')
+
+    return schemas.Msg(code=0, msg='添加成功', data=True)
 
 
 @router.post("/get_permissions_for_user_in_domain")
@@ -228,7 +229,6 @@ async def edit_role(
     return schemas.Msg(code=0, msg='ok', data=res.matched_count)
 
 
-
 @router.get("/update_api_list")
 async def update_api_list(
         request: Request,

models/behavior_analysis.py

@@ -161,6 +161,7 @@ class BehaviorAnalysis:
         # 用户自带过滤
         if 'data_where' in kwargs:
             self.global_filters.extend(kwargs['data_where'].get(self.game, []))
+        self.global_filters.extend(self.data_in.ext_filter)
 
     def _get_time_particle_size(self):
         return self.event_view.get('timeParticleSize') or 'P1D'

models/user_analysis.py

@@ -54,6 +54,7 @@ class UserAnalysis:
         if 'data_where' in kwargs:
             self.global_filters.extend(kwargs['data_where'].get(self.game, []))
 
+        self.global_filters.extend(self.data_in.ext_filter)
     async def _init_table(self):
         """
         从redis中取出表字段，构建表结构

models/x_analysis.py

@@ -57,6 +57,7 @@ class XAnalysis:
         if 'data_where' in kwargs:
             self.account_filters = kwargs['data_where'].get(self.game, [])
 
+        self.global_filters.extend(self.data_in.ext_filter)
     def handler_filts(self, filters):
         where = []
         for item in filters:

schemas/sql.py

@@ -12,3 +12,4 @@ class CkQuery(BaseModel):
     eventView: dict = None
     events: Union[List[dict], dict] = None
     report_id: str = None
+    ext_filter: list = []