|
@@ -111,9 +111,11 @@ class SysMsgView(View):
|
|
if username:
|
|
if username:
|
|
userID_list = ModelService.get_user_list_by_username(username)
|
|
userID_list = ModelService.get_user_list_by_username(username)
|
|
sm_qs = sm_qs.filter(userID_id__in=userID_list)
|
|
sm_qs = sm_qs.filter(userID_id__in=userID_list)
|
|
|
|
+ count = sm_qs.count()
|
|
sm_qs = sm_qs[(page - 1) * line:page * line]. \
|
|
sm_qs = sm_qs[(page - 1) * line:page * line]. \
|
|
values('status', 'id', 'msg', 'addTime', 'updTime', 'userID__NickName')
|
|
values('status', 'id', 'msg', 'addTime', 'updTime', 'userID__NickName')
|
|
- return response.json(0, list(sm_qs))
|
|
|
|
|
|
+
|
|
|
|
+ return response.json(0, {'datas':list(sm_qs),'count':count})
|
|
else:
|
|
else:
|
|
return response.json(444, 'page,line')
|
|
return response.json(444, 'page,line')
|
|
else:
|
|
else:
|