|
@@ -777,10 +777,10 @@ async def userlist( #user_id_1: int = Query(None ,description='用户id'),
|
|
"createTime": user.create_time.strftime('%Y-%m-%d %H:%M:%S') if user.create_time else '',
|
|
"createTime": user.create_time.strftime('%Y-%m-%d %H:%M:%S') if user.create_time else '',
|
|
"delFlag":user.del_flag,
|
|
"delFlag":user.del_flag,
|
|
"dept":{
|
|
"dept":{
|
|
- "createBy": user_id_get_user_info(db,dept.create_by).user_name if user.create_by else None,
|
|
|
|
- "createTime": dept.create_time.strftime('%Y-%m-%d %H:%M:%S') if user.create_time else None,
|
|
|
|
- "updateBy": user_id_get_user_info(db,dept.update_by).user_name if user.update_by else None,
|
|
|
|
- "updateTime": dept.create_time.strftime('%Y-%m-%d %H:%M:%S') if user.create_time else None,
|
|
|
|
|
|
+ "createBy": user_id_get_user_info(db,dept.create_by).user_name if dept.create_by else None,
|
|
|
|
+ "createTime": dept.create_time.strftime('%Y-%m-%d %H:%M:%S') if dept.create_time else None,
|
|
|
|
+ "updateBy": user_id_get_user_info(db,dept.update_by).user_name if dept.update_by else None,
|
|
|
|
+ "updateTime": dept.create_time.strftime('%Y-%m-%d %H:%M:%S') if dept.create_time else None,
|
|
"remark": '',#dept.remark,
|
|
"remark": '',#dept.remark,
|
|
"deptId": dept.dept_id,
|
|
"deptId": dept.dept_id,
|
|
"parentId": dept.parent_id,
|
|
"parentId": dept.parent_id,
|