Merge branch 'dev'

data_manage/operate.py

@@ -92,8 +92,8 @@ def get_channel(arg):
     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}))) 
-            or oper_user_id={user_id} or put_user_id={user_id}"""
+                 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}))
+            or oper_user_id={user_id} or put_user_id={user_id})"""
 
     data1 = db.zx.getData_json(sql)