|
|
@@ -19,11 +19,16 @@ from Model.models import SysMsgModel, FeedBackModel, UserExtendModel
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
from Service.ModelService import ModelService
|
|
|
+<<<<<<< .mine
|
|
|
from django.db.models import Q
|
|
|
|
|
|
|
|
|
-class SysMsgView(View):
|
|
|
+=======
|
|
|
+
|
|
|
+
|
|
|
|
|
|
+>>>>>>> .theirs
|
|
|
+class SysMsgView(View):
|
|
|
def get(self, request, *args, **kwargs):
|
|
|
request.encoding = 'utf-8'
|
|
|
operation = kwargs.get('operation', None)
|
|
|
@@ -144,8 +149,14 @@ class SysMsgView(View):
|
|
|
sm_qs = sm_qs.filter(userID_id__in=userID_list)
|
|
|
count = sm_qs.count()
|
|
|
sm_qs = sm_qs[(page - 1) * line:page * line]. \
|
|
|
- values('status', 'id', 'msg', 'addTime', 'updTime', 'userID__username')
|
|
|
-
|
|
|
+ values('status', 'id', 'msg', 'addTime', 'updTime', 'userID__username','userID__userEmail','userID__phone')
|
|
|
+ for k, v in enumerate(sm_qs):
|
|
|
+ if sm_qs[k]['userID__username']=='':
|
|
|
+ sm_qs[k]['userID__username']=sm_qs[k]['userID__userEmail']
|
|
|
+ elif sm_qs[k]['userID__username']=='' and sm_qs[k]['userID__userEmail']=='':
|
|
|
+ sm_qs[k]['userID__username']=sm_qs[k]['userID__phone']
|
|
|
+ sm_qs[k].pop('userID__userEmail')
|
|
|
+ sm_qs[k].pop('userID__phone')
|
|
|
return response.json(0, {'datas': list(sm_qs), 'count': count})
|
|
|
else:
|
|
|
return response.json(444, 'page,line')
|
chenjunkai