Merge pull request #154 in RMS/api-main-service from red-develop to RMSv2

* commit '2ec865b6':
  fixing

app/applicationlayer/master/Account/views.py

@@ -12,6 +12,7 @@ from django_filters.rest_framework import DjangoFilterBackend
 from app.applicationlayer.master.Account import serializer
 from app.applicationlayer.management.account.table_filters import AccountFilterset
 from app.helper.decorators import rms
+from django.db.models import Q
 
 
 class AdminAccountViewSet(viewsets.ModelViewSet):
@@ -29,13 +30,13 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
 
     # @rms.department_list
     def list(self, request, *args, **kwargs):
-        try:
+        # try:
 
             queryset = self.filter_queryset(self.get_queryset())
             if len(self.request.query_params) > 0:
                 dept = self.request.query_params['department_code']
                 company = self.request.query_params['company_code']
-                queryset = Users.objects.filter(
+                queryset = queryset.filter(
                     Q(department__company=company) &
                     Q(department=dept)
                 )
@@ -54,8 +55,8 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
 
             serializer = self.get_serializer(queryset, many=True)
             return Response(serializer.data)
-        except Exception as e:
-            return Response(
-                {'message': "query params department_code and company_code are both expected"},
-                status=status.HTTP_400_BAD_REQUEST
-            )
+        # except Exception as e:
+        #     return Response(
+        #         {'message': "query params department_code and company_code are both expected"},
+        #         status=status.HTTP_400_BAD_REQUEST
+        #     )