|
@@ -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
|