调整用户类接口

routers/prod_api/system/user/__init__.py

@@ -216,61 +216,8 @@ async def userlist( deptId: int = Query(None ,description='部门id'),
         traceback.print_exc()
         raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
 
-@router.get('/{user_id_1}')
-async def userlist( user_id_1: int = Query(None ,description='用户id'),
-                    db: Session = Depends(get_db),
-                    user_id: int = Depends(valid_access_token)):
-    try:
-
-        user = user_id_get_user_info(db,user_id_1)
-        # 将查询结果转换为列表形式的字典
-        roleIds = user_id_get_user_roleIds(db, user_id_1)
-        user_roles = role_id_list_get_user_role(db,roleIds)
-
-        user_list = {
-                "userId": user.user_id,
-                "tenantId": user.tenant_id,
-                "deptId": user.dept_id,
-                "userName": user.user_name,
-                "nickName": user.nick_name,
-                "userType": user.user_type,
-                "email": user.email,
-                "phonenumber": user.phonenumber,
-                "sex": user.sex,
-                "avatar": user.avatar,
-                "status": user.status,
-                "loginIp": user.login_ip,
-                "loginDate": user.login_date.strftime('%Y-%m-%d %H:%M:%S') if user.login_date else '',
-                "remark": user.remark,
-                "createTime": user.create_time.strftime('%Y-%m-%d %H:%M:%S') if user.create_time else '',
-                "deptName": user.dept_name,
-                "roles": user_roles,
-                "roleIds": None,
-                "postIds": None,
-                "roleId": None
-            }
-
-        roles = get_role(db)
 
 
-        # 返回结果
-        return {
-            "code": 200,
-            "msg": "成功用户列表",
-            "data": {
-                "user":user_list,
-                "roleIds":roleIds,
-                "roles":roles,
-                "postIds":[],
-                "posts":[]
-            }
-        }
-
-
-    except Exception as e:
-        traceback.print_exc()
-        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
-
 @router.get('/list/dept/{dept_id}')
 async def get_dept_user_list(
     # request: Request,
@@ -405,6 +352,61 @@ async def get_user_video_points(
             "msg": "成功",
             "data":None
         }
+    except Exception as e:
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
+
+@router.get('/{user_id_1}')
+async def userlist( user_id_1: int = Query(None ,description='用户id'),
+                    db: Session = Depends(get_db),
+                    user_id: int = Depends(valid_access_token)):
+    try:
+
+        user = user_id_get_user_info(db,user_id_1)
+        # 将查询结果转换为列表形式的字典
+        roleIds = user_id_get_user_roleIds(db, user_id_1)
+        user_roles = role_id_list_get_user_role(db,roleIds)
+
+        user_list = {
+                "userId": user.user_id,
+                "tenantId": user.tenant_id,
+                "deptId": user.dept_id,
+                "userName": user.user_name,
+                "nickName": user.nick_name,
+                "userType": user.user_type,
+                "email": user.email,
+                "phonenumber": user.phonenumber,
+                "sex": user.sex,
+                "avatar": user.avatar,
+                "status": user.status,
+                "loginIp": user.login_ip,
+                "loginDate": user.login_date.strftime('%Y-%m-%d %H:%M:%S') if user.login_date else '',
+                "remark": user.remark,
+                "createTime": user.create_time.strftime('%Y-%m-%d %H:%M:%S') if user.create_time else '',
+                "deptName": user.dept_name,
+                "roles": user_roles,
+                "roleIds": None,
+                "postIds": None,
+                "roleId": None
+            }
+
+        roles = get_role(db)
+
+
+        # 返回结果
+        return {
+            "code": 200,
+            "msg": "成功用户列表",
+            "data": {
+                "user":user_list,
+                "roleIds":roleIds,
+                "roles":roles,
+                "postIds":[],
+                "posts":[]
+            }
+        }
+
+
     except Exception as e:
         traceback.print_exc()
         raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")