diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py index f7769dd..70b03bc 100644 --- a/hb_server/apps/wf/serializers.py +++ b/hb_server/apps/wf/serializers.py @@ -1,4 +1,4 @@ -from apps.system.models import User +from apps.system.models import Organization, User from apps.system.serializers import UserSimpleSerializer import rest_framework from rest_framework import serializers @@ -135,6 +135,11 @@ class TicketDetailSerializer(serializers.ModelSerializer): i['field_display'] = ','.join(list(User.objects.filter(id__in=i['field_value']).values_list('name', flat=True))) else: i['field_display'] = User.objects.get(id=i['field_value']).name + elif 'deptSelect' in i['label']: + if isinstance(i['field_value'], list): + i['field_display'] = ','.join(list(Organization.objects.filter(id__in=i['field_value']).values_list('name', flat=True))) + else: + i['field_display'] = Organization.objects.get(id=i['field_value']).name elif i['field_type'] in ['radio', 'select']: for m in i['field_choice']: if m['id'] == i['field_value']: