|
|
@@ -1,6 +1,7 @@
|
|
|
from model.DateUtils import DateUtils
|
|
|
from model.DataBaseUtils import *
|
|
|
from config.common_config import super_auth
|
|
|
+import pandas as pd
|
|
|
du = DateUtils()
|
|
|
|
|
|
|
|
|
@@ -24,6 +25,13 @@ def user_channel_group(arg):
|
|
|
else:
|
|
|
# 返回所有公众号组
|
|
|
sql = "select id,name from channel_group"
|
|
|
+ df = db.quchen_text.getData_pd(sql)
|
|
|
+ print(df)
|
|
|
+ sql2 = "select id,nick_name from t_mp_account where del_flag=0"
|
|
|
+ df2 = db.zx.getData_pd(sql2)
|
|
|
+ df3 = pd.merge(df,df2,how='left',on='')
|
|
|
+
|
|
|
+
|
|
|
return db.quchen_text.getData_json(sql)
|
|
|
|
|
|
|
|
|
@@ -109,7 +117,10 @@ def get_pitcher(arg):
|
|
|
db = MysqlUtils()
|
|
|
|
|
|
if user_id in super_auth:
|
|
|
- sql = f"select user_id,nick_name from t_sys_user where del_flag=0"
|
|
|
+ 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
|
|
|
+ where a.del_flag=0 and c.role_id in (7,9) """
|
|
|
return db.zx.getData_json(sql)
|
|
|
|
|
|
|
