Merge pull request #335 in RMS/api-main-service from RMSv2 to staging

* commit '475d6c94':
  fixing
  fixing
  fixing

app/applicationlayer/cms/master/template/account/views.py

@@ -13,7 +13,7 @@ class UserListTemplate(APIView):
     pagination_class = CustomPagination
 
     def get(self, request, *args, **kwargs):
-        try:
+        # try:
             serializer = ChangeRequestList
             dept = self.request.query_params['department_code']
             user_codes = models.User.objects.filter(
@@ -23,9 +23,15 @@ class UserListTemplate(APIView):
             verified_users = models.AllowedCompany.objects.filter(
                 Q(id_number__in=user_codes) &
                 Q(create_change_request_template=True)
-            ).exclude(id=request.user.id)
+            ).values('id_number').exclude(id=request.user.id)
+
+            user_list = models.User.objects.filter(
+                code__in=verified_users
+            )
+
 
-            page = self.paginate_queryset(verified_users)
+
+            page = self.paginate_queryset(user_list)
 
             if page is not None:
 
@@ -39,11 +45,11 @@ class UserListTemplate(APIView):
                 )
             return self.get_paginated_response(message)
 
-        except Exception as e:
-            return Response(
-                {"message": "this endpoint expect a query params department_id"},
-                status=status.HTTP_400_BAD_REQUEST
-            )
+        # except Exception as e:
+        #     return Response(
+        #         {"message": "this endpoint expect a query params department_id"},
+        #         status=status.HTTP_400_BAD_REQUEST
+        #     )
 
     @property
     def paginator(self):