sonder/fastapi-project-template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复注册异常，删除用户异常，调整用户信息存储时间

Browse Source
This commit is contained in:
皓月归尘
2025-02-23 03:58:38 +08:00
parent 5be35d8231
commit df5f2977d4
10 changed files with 984 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/log.py
View File

@@ -48,7 +48,6 @@ async def get_login_log(request: Request,
f'{k}__contains': v for k, v in {
'username': username,
'nickname': nickname,
'department_id': department_id,
}.items() if v
}
if status is not None:
@@ -59,7 +58,9 @@ async def get_login_log(request: Request,
filterArgs['login_time__range'] = [startTime, endTime]
if not department_id:
filterArgs['user__department__id__in'] = sub_departments
result = await LoginLog.filter(**filterArgs, del_flag=1).offset(
else:
filterArgs['user__department__id'] = department_id
result = await LoginLog.filter(**filterArgs, user__del_flag=1, del_flag=1).offset(
(page - 1) * pageSize).limit(pageSize).values(
id="id",
user_id="user__id",
@@ -83,7 +84,7 @@ async def get_login_log(request: Request,
if item["session_id"] == log["session_id"]:
log["online"] = True
return Response.success(data={
"total": await LoginLog.filter(**filterArgs, del_flag=1, ).count(),
"total": await LoginLog.filter(**filterArgs, del_flag=1, user__del_flag=1, ).count(),
"result": result,
"page": page,
})
@@ -176,7 +177,6 @@ async def get_operation_log(request: Request,
'operation_type': type,
'operator__username': username,
'operator__nickname': nickname,
'department_id': department_id,
}.items() if v
}
if status is not None:
@@ -187,7 +187,10 @@ async def get_operation_log(request: Request,
filterArgs['operation_time__range'] = [startTime, endTime]
if not department_id:
filterArgs['department__id__in'] = sub_departments
result = await OperationLog.filter(**filterArgs, del_flag=1).offset((page - 1) * pageSize).limit(
else:
filterArgs['department__id'] = department_id
result = await OperationLog.filter(**filterArgs, operator__del_flag=1, del_flag=1).offset(
(page - 1) * pageSize).limit(
pageSize).values(
id="id",
operation_name="operation_name",
@@ -211,7 +214,7 @@ async def get_operation_log(request: Request,
cost_time="cost_time"
)
return Response.success(data={
"total": await OperationLog.filter(**filterArgs, del_flag=1).count(),
"total": await OperationLog.filter(**filterArgs, del_flag=1, operator__del_flag=1).count(),
"result": result,
"page": page,
"pageSize": pageSize