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

* commit 'e3232439':
  fixing
  testing

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

@@ -13,8 +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(
@@ -38,7 +37,7 @@ class UserListTemplate(APIView):
                     'list of User found',
                     serializer.data
                 )
-                return self.get_paginated_response(message)
+            return self.get_paginated_response(message)
 
         except Exception as e:
             return Response(

app/applicationlayer/management/user/serializers.py

@@ -124,14 +124,14 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
             if data.id == 1 and user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
                 mod = data.modules.all()
             elif data.id == 1 and user.user_type.upper() != enums.UserTypeEnum.USER.value:
-                mod = user_module = models.Module.objects.filter(
+                mod = models.Module.objects.filter(
                         name__icontains="user"
                     )
             else:
                 mod = data.modules.all()
             
             if user.user_type.upper() != enums.UserTypeEnum.USER.value:
-                user_mod = user_module = models.Module.objects.filter(name__icontains="user")
+                user_module = models.Module.objects.filter(name__icontains="user")
                 mod = mod.union(mod, user_module)
             else:
                 mod = mod