Commit 1ede6600 authored by xianyang's avatar xianyang

优化账户查询分页,docker-file文件

parent 027bcd29
......@@ -25,10 +25,10 @@ def get_account_list(db: Session, param):
if param.name:
count = db.query(func.count(models.Account.id)).filter(models.Account.name.like(f'%{param.name}%')).scalar()
query_res = db.query(models.Account).filter(models.Account.name.like(f'%{param.name}%')).order_by(models.Account.id.desc()).\
offset((int(param.page) - 1) * param.size).limit(param.page * param.size).all()
offset((int(param.page) - 1) * param.size).limit(param.size).all()
else:
count = db.query(func.count(models.Account.id)).scalar()
query_res = db.query(models.Account).order_by(models.Account.id.desc()).offset((int(param.page) - 1) * param.size).limit(param.page * param.size).all()
query_res = db.query(models.Account).order_by(models.Account.id.desc()).offset((int(param.page) - 1) * param.size).limit(param.size).all()
if not query_res:
return []
for i in query_res:
......
......@@ -23,7 +23,7 @@ def get_roles(db: Session, param):
offset((int(param.page) - 1) * param.size).limit(param.page * param.size).all()
count = db.query(models.Role).filter(models.Role.role_name.like(f'%{name}%')).scalar()
else:
query_res = db.query(models.Role).order_by(models.Role.id.desc()).offset((int(param.page) - 1) * param.size).limit(param.page * param.size).all()
query_res = db.query(models.Role).order_by(models.Role.id.desc()).offset((int(param.page) - 1) * param.size).limit(param.size).all()
count = db.query(func.count(models.Role.id)).scalar()
if not query_res:
return [], 0
......
......@@ -37,6 +37,6 @@ def delete_user(role_id: int, db: Session = Depends(get_db)):
@router.post("/list")
def role_list(data: schemas.RoleList, db: Session = Depends(get_db)):
"""用户列表"""
"""角色列表"""
result, total = crud.get_roles(db, data)
return HttpResultResponse(total=total, data=result)
......@@ -19,7 +19,7 @@ services:
context: ./../_base/python-38/
image: python-38
ports:
- "8001:8001"
- "8009:8009"
deploy:
resources:
limits:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment