1

data_manage/operate.py

@@ -160,31 +160,23 @@ def get_channel(arg):
             elif name_cahnnel in _['nickName']:
                 print("3----------->" + _['resourceName'])
                 data1.append({'id': _['id'], 'nick_name': _['resourceName']})
-        # elif name_cahnnel in _['nickName']:
-        #         print("4----------->" + _['resourceName'])
-        #         data1.append({'id': _['id'], 'nick_name': _['resourceName']})
-
-    # print("10------------------------->")
-    # # # 加上配置的号
-    # 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}"""
-    # print("11------------------------->")
-    # data2 = db.quchen_text.getOne(sql2)
-    # print("12------------------------->")
-    # data3 = []
-    # if data2:
-    #     print("14------------------------->")
-    #     data2_2 = tuple(data2.split(','))
-    #     for _ in data2_2:
-    #         data3.append({'id': int(_), 'nick_name': channel_dict[int(_)]})
-    # print("13------------------------->")
-    # data4=[]
-    # data4 = data1 + data3
-    # print("5------------------------->"+data4)
+        
+
+    # # 加上配置的号
+    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(data1))
-    return data1[:500000]
+    print(len(data4))
+    return data4[:500000]
 
 
 def get_pitcher(arg):