Merge branch 'dev'

config/common_config.py

@@ -1,2 +0,0 @@
-
-super_auth = [1, 158]

data_manage/operate.py

@@ -1,6 +1,6 @@
 from model.DateUtils import DateUtils
 from model.DataBaseUtils import *
-from config.common_config import super_auth
+from model.UserAuthUtils import super_auth
 import pandas as pd
 du = DateUtils()
 
@@ -80,18 +80,23 @@ def get_channel(arg):
     db = MysqlUtils()
     user_id= arg.get('user_id')
     name = arg.get('name')
-    if user_id in super_auth:
+
+    # 超级权限
+    if user_id in super_auth():
         sql = f"select id,nick_name from t_mp_account where nick_name like '%{name}%' and del_flag=0"
-        return db.zx.getData_json(sql)
 
+        return db.zx.getData_json(sql)
 
-    op = f" nick_name like '%{name}%'" if name else ''
+    # 普通权限
+    # # 搜索空字符默认给出全部
+    op = f" nick_name like '%{name}%'  and " if name !='' else ''
+    sql = f"""select id,nick_name from t_mp_account where {op} (oper_user_id in 
+                 (select user_id from t_sys_user_group_relation where group_id=(select id from t_sys_user_group where del_flag=0 and group_user_id={user_id})) or 
+                 put_user_id in (select user_id from t_sys_user_group_relation where group_id=(select id from t_sys_user_group where del_flag=0 and group_user_id={user_id})))"""
 
-    sql = f"""select id,nick_name from t_mp_account where {op} and (oper_user_id in 
-         (select user_id from t_sys_user_group_relation where group_id=(select id from t_sys_user_group where del_flag=0 and group_user_id={user_id})) or 
-         put_user_id in (select user_id from t_sys_user_group_relation where group_id=(select id from t_sys_user_group where del_flag=0 and group_user_id={user_id})))"""
     data1 = db.zx.getData_json(sql)
 
+    # # 加上配置的号
     sql2 = f"""select GROUP_CONCAT(channel_ids) from user_channel_group_auth a
                      left join channel_group b on a.channel_group_id=b.id
                      where user_id={user_id}"""
@@ -104,7 +109,8 @@ def get_channel(arg):
         data3 = db.zx.getData_json(sql3)
     else:
         data3 = []
-    return data1 + data3
+    data4 = data1 + data3
+    return data4[:100]  # 给100个
 
 
 def get_pitcher(arg):
@@ -112,7 +118,7 @@ def get_pitcher(arg):
 
     db = MysqlUtils()
 
-    if user_id in super_auth:
+    if user_id in super_auth():
            sql = """
                 select a.user_id,nick_name from t_sys_user a 
                 left join t_sys_user_role c on a.user_id =c.user_id 

data_manage/pitcher_panel.py

@@ -3,8 +3,10 @@ from model.DataBaseUtils import *
 from model.log import logger
 from model.CommonUtils import *
 from model import UserAuthUtils
+from model.UserAuthUtils import super_auth
 du = DateUtils()
-from config.common_config import *
+
+
 from data_manage.operate import get_pitcher
 
 log = logger()
@@ -113,7 +115,7 @@ where 1=1 {op1}
 
 def get_channel_overview(user_id,channel,pitcher,stage,start,end,page,page_size,order_by,order):
     db=MysqlUtils()
-    if user_id in super_auth:
+    if user_id in super_auth():
         op = ''
     else:
         if len(UserAuthUtils.get_auth_channel(user_id)) == 0:
@@ -365,7 +367,7 @@ select
 
 def get_channel_active(user_id,channel,pitcher,start,end,page,page_size,order_by,order):
     db = MysqlUtils()
-    if user_id in super_auth:
+    if user_id in super_auth():
         op = ''
     else:
         if len(UserAuthUtils.get_auth_channel(user_id)) == 0:
@@ -448,7 +450,7 @@ left join dw_channel_user_daily b using(dt,channel) {op5}
 def get_channel_order_trend(user_id,channel,pitcher,start,end,page,page_size,order_by,order):
     db = MysqlUtils()
 
-    if user_id in super_auth:
+    if user_id in super_auth():
         op = ''
     else:
         if len(UserAuthUtils.get_auth_channel(user_id)) == 0:
@@ -589,7 +591,7 @@ left join src_book_info c on a.dt=c.dt and a.book=c.book  and a.type=c.type and
 def get_channel_summary(user_id,channel,pitcher,page,page_size,order_by,order,state,location,start,end):
     db=MysqlUtils()
 
-    if user_id in super_auth:
+    if user_id in super_auth():
         op = ''
     else:
         if len(UserAuthUtils.get_auth_channel(user_id))==0:

data_manage/public_analysis.py

@@ -3,7 +3,7 @@ from model.DataBaseUtils import *
 from model.log import logger
 from model.CommonUtils import *
 from data_manage.operate import get_pitcher,get_user_name_by_id
-from config.common_config import super_auth
+from model.UserAuthUtils import super_auth
 from model import UserAuthUtils
 du = DateUtils()
 log = logger()
@@ -309,7 +309,7 @@ concat(sum(m5-m4),',',sum(m5-m4)/sum(if(dt>=SUBDATE(CURRENT_DATE,INTERVAL 148 da
 
 
 def pitcher_overview(user_id,start, end, pitcher, page, page_size, order_by, order):
-    if user_id in super_auth:
+    if user_id in super_auth():
         op = ''
     else:
         user = tuple([i['nick_name'] for i in get_pitcher({'user_id': user_id})] + [get_user_name_by_id(user_id)])
@@ -388,7 +388,7 @@ def pitcher_overview(user_id,start, end, pitcher, page, page_size, order_by, ord
 
 def boss_panel_summary(user_id,start,end,pitcher, type, stage, page, page_size, order_by, order):
 
-    if user_id in super_auth:
+    if user_id in super_auth():
         op = ''
     else:
         if len(UserAuthUtils.get_auth_channel(user_id)) == 0:
@@ -434,7 +434,7 @@ def image_rank(start, end, type,book, page, page_size, order_by, order):
 
 """广告排行榜"""
 def advertisement_rank(user_id,start,end,type,page,page_size,order,order_by,book,channel,pitcher):
-    if user_id in super_auth:
+    if user_id in super_auth():
         op1 = ''
     else:
         user = tuple([i['nick_name'] for i in get_pitcher({'user_id': user_id})] + [get_user_name_by_id(user_id)])

model/UserAuthUtils.py

@@ -40,6 +40,12 @@ def get_auth_channel(user_id):
         data3 =[]
     return tuple(data1+data3)
 
+def super_auth():
+    "获取超级数据权限的用户列表"
+    db = MysqlUtils()
+    sql = "select user_id from t_sys_user_role where role_id =39"
+    return db.zx.getOneList(sql)
+
 
 if __name__ == '__main__':
     print(get_auth_channel(109))