Merge branch 'core-dev-gladys' into 'core-dev'

{dev bugfix} users download fix

See merge request rms/Backend/api-main-service!867

app/applicationlayer/master/download/accounts/views.py

@@ -5,13 +5,11 @@ from drf_renderer_xlsx.renderers import XLSXRenderer
 from app.entities.models import (
     User
 )
-# from app.applicationlayer.form_listing_ import headers
 from app.applicationlayer.master.download.accounts.serializers import headers
 from django.db.models import CharField, Value
 from django.db.models import Q
 from rest_framework.response import Response
 from rest_framework.permissions import AllowAny
-# from cms.applicationlayer.utilities import logged_user
 from rest_framework.exceptions import ParseError
 from rest_framework import status
 
@@ -26,15 +24,13 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     def list(self, request, *args, **kwargs):
 
         user_type = self.request.user.user_type
-        company = self.request.user.department.company
-        department = self.request.user.department
+        company = self.request.user.department.company.code
+        department = self.request.user.department.code
         
         if user_type == 'CUA':
-            # code = data.values_list('department__company', flat=True)[0]
             data = User.objects.filter(
                 department__company=company).exclude(id=1)
         elif user_type == 'DUA':
-            # code = data.values_list('department', flat=True)[0]
             data = User.objects.filter(
                 department=department).exclude(id=1)
         elif user_type == 'SU':