|
|
@@ -289,8 +289,8 @@ def findEquipmentInfoInterface(request, *callback_args, **callback_kwargs):
|
|
|
for k, v in enumerate(send_dict["datas"]):
|
|
|
for val in res:
|
|
|
if v['pk'] == val.id:
|
|
|
- username = ModelService.get_user_name(send_dict["datas"][k]['fields']['userID'])
|
|
|
- send_dict["datas"][k]['fields']['username'] = username
|
|
|
+ send_dict["datas"][k]['fields']['username'] = \
|
|
|
+ ModelService.get_user_mark(send_dict["datas"][k]['fields']['userID'])
|
|
|
send_dict["datas"][k]['fields']['primaryusername'] = \
|
|
|
ModelService.get_user_mark(send_dict["datas"][k]['fields']['primaryUserID'])
|
|
|
send_dict['count'] = count
|
chenjunkai