消息确认改为系统消息，昵称返回错误问题

Controller/SensorGateway/GatewayFamilyMemberController.py

@@ -228,7 +228,7 @@ class GatewayFamilyMemberView(View):
                     'addTime': now_time,
                     'updTime': now_time,
                     'userID_id': family_join['family__user_id'] if join_type == 1 else family_join['user_id'],
-                    'eventType': 705
+                    'eventType': 0
                 }
                 if confirm == 'confirm':
                     msg_text = cls.get_confirm_text(nick_name, family_name, join_type, True, lang)
@@ -295,12 +295,16 @@ class GatewayFamilyMemberView(View):
         family_join_qs = FamilyMemberJoin.objects.filter(id=join_id)
         if not family_join_qs.exists():
             return response.json(173)
-        family_join_qs = family_join_qs.values('type', 'user__NickName', 'family__name', 'status', 'id')
+        family_join_qs = family_join_qs.values('type', 'user__NickName', 'family__name', 'status', 'id',
+                                               'family__user__NickName')
         family_join_qs = family_join_qs.first()
+        nick_name = family_join_qs['user__NickName']
+        if family_join_qs['type'] == 0:
+            nick_name = family_join_qs['family__user__NickName']
         return response.json(0, {
             'id': family_join_qs['id'],
             'type': family_join_qs['type'],
-            'nickName': family_join_qs['user__NickName'],
+            'nickName': nick_name,
             'familyName': family_join_qs['family__name'],
             'status': family_join_qs['status'],
         })