feature:

1,feedback add username
2,sysmsg add username

Controller/FeedBack.py

@@ -23,6 +23,7 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
+from django.db import transaction
 
 
 class FeedBackView(View):
@@ -84,7 +85,7 @@ class FeedBackView(View):
                 if sm['feedbackmodel__id'] == fb['id']:
                     img_url = bucket.sign_url('GET', sm['name'], 3600)
                     fb['img_url'].append(img_url)
-                    fb['FS__name'] = sm['name']
+                    # fb['FS__name'] = sm['name']
             res.append(fb)
         return response.json(0, res)
 
@@ -96,28 +97,26 @@ class FeedBackView(View):
         res_3 = request_dict.get('res_3', None)
         # res_list = []
         try:
-            fb = FeedBackModel()
-            fb.addTime = nowTime
-            fb.updTime = nowTime
-            fb.content = content
-            fb.userID_id = userID
-            fb.save()
-            if res_1:
-                fb.FS.add(StatResModel.objects.create(addTime=nowTime, name=res_1))
-            if res_2:
-                fb.FS.add(StatResModel.objects.create(addTime=nowTime, name=res_2))
-            if res_3:
-                fb.FS.add(StatResModel.objects.create(addTime=nowTime, name=res_3))
-            if not res_1 and not res_2 and not res_3:
-                fb.delete()
-                return response.json(444, 'res_1,2,3')
+            with transaction.atomic():
+                fb = FeedBackModel()
+                fb.addTime = nowTime
+                fb.updTime = nowTime
+                fb.content = content
+                fb.userID_id = userID
+                fb.save()
+                if res_1:
+                    fb.FS.add(StatResModel.objects.create(addTime=nowTime, name=res_1))
+                if res_2:
+                    fb.FS.add(StatResModel.objects.create(addTime=nowTime, name=res_2))
+                if res_3:
+                    fb.FS.add(StatResModel.objects.create(addTime=nowTime, name=res_3))
         except Exception as e:
             print(repr(e))
-            # fb.delete()
             return response.json(500, repr(e))
         else:
             return response.json(0)
 
+
     def do_get_upload_url(self, request_dict, response):
         uploadType = request_dict.get('uploadType', None)
         uploadType = json.loads(uploadType)
@@ -171,7 +170,7 @@ class FeedBackView(View):
                     fb_qs = fb_qs.filter(**filter_data)
                 count = fb_qs.count()
                 fb_qs = fb_qs[(page - 1) * line:page * line]. \
-                    values('id', 'status', 'content', 'addTime', 'updTime')
+                    values('id', 'status', 'content', 'addTime', 'updTime','userID__username')
                 sid_list = []
 
                 for fb in fb_qs:
@@ -188,7 +187,7 @@ class FeedBackView(View):
                             img_url = bucket.sign_url('GET', sm['name'], 3600)
                             # img_url.replace('statres.oss-cn-hongkong.aliyuncs.com','static.zositech.xyz')
                             fb['img_url'].append(img_url)
-                            fb['FS__name'] = sm['name']
+                            # fb['FS__name'] = sm['name']
                     res.append(fb)
                 return response.json(0, {'datas': res, 'count': count})
             else:

Controller/SysMsg.py

@@ -115,7 +115,7 @@ 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__NickName')
+                    values('status', 'id', 'msg', 'addTime', 'updTime', 'userID__username')
 
                 return response.json(0, {'datas':list(sm_qs),'count':count})
             else: