1

data_manage/operate.py

@@ -152,7 +152,7 @@ def get_channel(arg):
     data1 = []
     for _ in rsp.json()['data']:
         # if name_cahnnel in _['resourceName']:
-        if name_cahnnel and name_cahnnel in _['resourceName']:
+        if name_cahnnel or name_cahnnel in _['resourceName']:
             print("1----------->" + _['resourceName'])
             if not name_cahnnel:
                 print("2----------->" + _['resourceName'])
@@ -163,20 +163,20 @@ def get_channel(arg):
         
 
     # # 加上配置的号
-    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={select_id}"""
-    data2 = db.quchen_text.getOne(sql2)
-    data3 = []
-    if data2:
-        data2_2 = tuple(data2.split(','))
-        for _ in data2_2:
-            data3.append({'id': int(_), 'nick_name': channel_dict[int(_)]})
-    data4=[]
-    data4 = data1 + data3
+    # 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={select_id}"""
+    # data2 = db.quchen_text.getOne(sql2)
+    # data3 = []
+    # if data2:
+    #     data2_2 = tuple(data2.split(','))
+    #     for _ in data2_2:
+    #         data3.append({'id': int(_), 'nick_name': channel_dict[int(_)]})
+    # data4=[]
+    # data4 = data1 + data3
     print("----------->")
-    print(len(data4))
-    return data4[:500000]
+    print(len(data1))
+    return data1[:500000]
 
 
 def get_pitcher(arg):