中文:收口权限与中心/立项配置改造
This commit is contained in:
@@ -42,6 +42,7 @@ async def create_site(db: AsyncSession, study_id: uuid.UUID, site_in: SiteCreate
|
||||
name=site_in.name,
|
||||
city=site_in.city,
|
||||
pi_name=site_in.pi_name,
|
||||
phone=site_in.phone,
|
||||
contact=site_in.contact,
|
||||
is_active=site_in.is_active,
|
||||
enrollment_plan_start_date=site_in.enrollment_plan_start_date,
|
||||
|
||||
@@ -5,8 +5,8 @@ from sqlalchemy import delete, func, select, update
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.core.config import (
|
||||
PROTECTED_ADMIN_CLINICAL_DEPARTMENT,
|
||||
PROTECTED_ADMIN_DEFAULT_PASSWORD,
|
||||
PROTECTED_ADMIN_DEPARTMENT,
|
||||
PROTECTED_ADMIN_EMAIL,
|
||||
PROTECTED_ADMIN_FULL_NAME,
|
||||
)
|
||||
@@ -43,7 +43,7 @@ async def create_user(
|
||||
password_hash=hash_password(user_in.password),
|
||||
full_name=user_in.full_name,
|
||||
role=UserRole(user_in.role),
|
||||
department=user_in.department,
|
||||
clinical_department=user_in.clinical_department,
|
||||
status=status_value,
|
||||
)
|
||||
db.add(user)
|
||||
@@ -70,8 +70,8 @@ async def update_user(db: AsyncSession, user: User, user_in: UserUpdate) -> User
|
||||
update_data["password_hash"] = hash_password(user_in.password)
|
||||
if user_in.full_name is not None:
|
||||
update_data["full_name"] = user_in.full_name
|
||||
if user_in.department is not None:
|
||||
update_data["department"] = user_in.department
|
||||
if user_in.clinical_department is not None:
|
||||
update_data["clinical_department"] = user_in.clinical_department
|
||||
|
||||
if update_data:
|
||||
await db.execute(update(User).where(User.id == user.id).values(**update_data))
|
||||
@@ -114,7 +114,7 @@ async def ensure_admin_exists(db: AsyncSession, *, default_password: str = PROTE
|
||||
password_hash=hash_password(default_password),
|
||||
full_name=PROTECTED_ADMIN_FULL_NAME,
|
||||
role=UserRole.ADMIN,
|
||||
department=PROTECTED_ADMIN_DEPARTMENT,
|
||||
clinical_department=PROTECTED_ADMIN_CLINICAL_DEPARTMENT,
|
||||
status=UserStatus.ACTIVE,
|
||||
)
|
||||
db.add(new_admin)
|
||||
|
||||
Reference in New Issue
Block a user