From 0afff45baec7be0ec3a4665691370ac86432d876 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 7 Mar 2022 11:40:32 +0800
Subject: [PATCH] fix: validate app perm error

---
 apps/perms/api/application/user_permission/common.py | 4 ++--
 apps/users/serializers/user.py                       | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/perms/api/application/user_permission/common.py b/apps/perms/api/application/user_permission/common.py
index 150581632..f24718560 100644
--- a/apps/perms/api/application/user_permission/common.py
+++ b/apps/perms/api/application/user_permission/common.py
@@ -10,7 +10,7 @@ from rest_framework.generics import (
     ListAPIView, get_object_or_404
 )
 
-from orgs.utils import tmp_to_root_org
+from orgs.utils import tmp_to_root_org, get_current_org
 from applications.models import Application
 from perms.utils.application.permission import (
     get_application_system_user_ids,
@@ -56,7 +56,7 @@ class MyGrantedApplicationSystemUsersApi(RoleUserMixin, BaseGrantedApplicationSy
 @method_decorator(tmp_to_root_org(), name='get')
 class ValidateUserApplicationPermissionApi(APIView):
     rbac_perms = {
-        'GET': 'ops.view_applicationpermission'
+        'GET': 'perms.view_applicationpermission'
     }
 
     def get(self, request, *args, **kwargs):
diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py
index d4380a0ff..5cc019cde 100644
--- a/apps/users/serializers/user.py
+++ b/apps/users/serializers/user.py
@@ -283,5 +283,7 @@ class ServiceAccountSerializer(serializers.ModelSerializer):
         return name
 
     def create(self, validated_data):
-        user, ak = User.create_service_account(validated_data['name'], validated_data['comment'])
+        name = validated_data['name']
+        comment = validated_data.get('comment', '')
+        user, ak = User.create_service_account(name, comment)
         return user