From 3c790cccb41bfb69df5123cc924dd6885e338181 Mon Sep 17 00:00:00 2001 From: Boris Date: Wed, 8 Jan 2025 17:37:09 +0800 Subject: [PATCH] feat: the first registered user will be the admin --- apps/nestjs-backend/src/features/user/user.service.ts | 2 +- .../collaborator-manage/components/Collaborator.tsx | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/nestjs-backend/src/features/user/user.service.ts b/apps/nestjs-backend/src/features/user/user.service.ts index d0ecc3e2c8..3a52103168 100644 --- a/apps/nestjs-backend/src/features/user/user.service.ts +++ b/apps/nestjs-backend/src/features/user/user.service.ts @@ -123,7 +123,7 @@ export class UserService { where: { isSystem: null }, }); - const isAdmin = !this.baseConfig.isCloud && userTotalCount === 0; + const isAdmin = userTotalCount === 0; if (!user?.avatar) { const avatar = await this.generateDefaultAvatar(user.id!); diff --git a/apps/nextjs-app/src/features/app/components/collaborator-manage/components/Collaborator.tsx b/apps/nextjs-app/src/features/app/components/collaborator-manage/components/Collaborator.tsx index 7046f4b17f..ecaacda846 100644 --- a/apps/nextjs-app/src/features/app/components/collaborator-manage/components/Collaborator.tsx +++ b/apps/nextjs-app/src/features/app/components/collaborator-manage/components/Collaborator.tsx @@ -26,7 +26,15 @@ export type ICollaborator = IUserCollaborator | IDepartmentCollaborator; export const Collaborator = (props: ICollaboratorProps) => { const { item, className, tips } = props; return ( -
+
{item.type === PrincipalType.User && ( )}