getUsermake

Controller/EquipmentManager.py

@@ -307,8 +307,8 @@ def findEquipmentInfoInterface(request, *callback_args, **callback_kwargs):
                 if v['pk'] == val.id:
                     username = ModelService.get_user_name(send_dict["datas"][k]['fields']['userID'])
                     send_dict["datas"][k]['fields']['username'] = username
-                    primary = ModelService.get_user_name(send_dict["datas"][k]['fields']['primaryUserID'])
-                    send_dict["datas"][k]['fields']['primaryusername'] = primary
+                    send_dict["datas"][k]['fields']['primaryusername'] = \
+                        ModelService.get_user_mark(send_dict["datas"][k]['fields']['primaryUserID'])
         send_dict['count'] = count
         return response.json(0, send_dict)
 

Service/ModelService.py

@@ -74,6 +74,18 @@ class ModelService:
         except Exception as e:
             return ''
 
+    @staticmethod
+    def get_user_mark(userID):
+        qs = Device_User.objects.filter(userID=userID).values('username','userEmail','phone')
+        if qs[0]['username']:
+            return qs[0]['username']
+        elif qs[0]['userEmail']:
+            return qs[0]['userEmail']
+        elif qs[0]['phone']:
+            return qs[0]['phone']
+        else:
+            return ''
+
     # 根据username获取userID
     @staticmethod
     def get_userID_byname(username):