fix: 修复自然人关系查询异常

TencentBlueKing · Sep 19, 2023 · 7505a5b · 7505a5b
1 parent 24ff4f7
commit 7505a5b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/bk-user/bkuser/apis/web/mixins.py b/src/bk-user/bkuser/apis/web/mixins.py
@@ -27,7 +27,8 @@ def get_current_tenant_id(self) -> str:
         return tenant_id
 
     def get_current_tenant_user(self) -> TenantUser:
-        tenant_user = TenantUser.objects.filter(id=self.request.user.id).first()
+        bk_username = self.request.user.get_property("bk_username")
+        tenant_user = TenantUser.objects.filter(id=bk_username).first()
         if not tenant_user:
             raise error_codes.TENANT_USER_NOT_EXIST
         return tenant_user
diff --git a/src/bk-user/bkuser/biz/natural_user.py b/src/bk-user/bkuser/biz/natural_user.py
@@ -51,17 +51,19 @@ def get_nature_user_by_tenant_user_id(tenant_user_id: str) -> Optional[NaturalUs
         if not tenant_user:
             raise error_codes.TENANT_USER_NOT_EXIST
 
-        natural_user = DataSourceUserNaturalUserRelation.objects.filter(
+        natural_user_relation = DataSourceUserNaturalUserRelation.objects.filter(
             data_source_user_id=tenant_user.data_source_user_id
         ).first()
-        if not natural_user:
+        if not natural_user_relation:
             return None
 
+        natural_user = natural_user_relation.natural_user
+
         return NaturalUserInfo(
             id=natural_user.id,
-            full_name=natural_user.name,
+            full_name=natural_user.full_name,
             data_source_user_ids=list(
-                DataSourceUserNaturalUserRelation.objects.filter(nature_user=natural_user.id).values_list(
+                DataSourceUserNaturalUserRelation.objects.filter(natural_user=natural_user).values_list(
                     "data_source_user_id", flat=True
                 )
             ),