update

src/manage/controls.py

@@ -864,7 +864,7 @@ def reply_wanzhu_consult(**kwargs):
         #发送app推送消息
         title = u"顽主杯"
         body = u"你收到一条顽主的消息"
-        user_id = 6209
+        #user_id = 6209
         params = {"type":"message","id":user_id}
         aliyunpush.push_notice_by_userid(user_id,title,body,params)
 

src/weixin/controls.py

@@ -2210,12 +2210,19 @@ def get_user_consult_list(request):
         return 0,[]
     kwargs = request.json
     record_id = kwargs.get("record_id")
-    qset = cm.WanzhuConsult.objects.filter(user_id=player_id)
-    data = list(qset.values())
-    for item in data:
-        if cm.WanzhuConsult.objects.filter(pid=item["id"]):
-            data.extend(cm.WanzhuConsult.objects.filter(Q(pid=item["id"])|Q(reply_user_id=player_id)).values())
+    if kwargs.get("user_id"):
+        player_id = kwargs.get("user_id")
 
+    qset = cm.WanzhuConsult.objects.filter(user_id=player_id,user_id__gt=0)
+    qdata = list(qset.values())
+    data = []
+    for item in qdata:
+        data.append(item)
+        if cm.WanzhuConsult.objects.filter(pid=item["id"]).exists():
+            reply_list = cm.WanzhuConsult.objects.filter(Q(pid=item["id"])).values()
+            for iitem in reply_list:
+                data.append(iitem)
+    print(data)
     data = sorted(data,key=lambda x:x["id"])
     #分页
     page = int(kwargs.get("page",1))
@@ -2224,7 +2231,6 @@ def get_user_consult_list(request):
         total,data = ccf.get_page_list(data,page,page_size)
     else:
         total = len(data)
-
     return total,data
 
 def get_user_zans(request):
@@ -2802,7 +2808,7 @@ def get_article_type_list(**kwargs):
 def get_wanzhu_consult_list(**kwargs):
     """
     """
-    qset = cm.Consult.objects.all().order_by("-ctime")
+    qset = cm.Consult.objects.filter(user_id__gt=0).order_by("-ctime")
     if kwargs.get("username"):
         qset = qset.filter(user_name__icontains=kwargs.get("username"))
     if kwargs.get("reply_status"):