项目基础模块代码

app/model/crud/sys_user_crud.py

@@ -1,23 +1,21 @@
-from app.model.model import SysUser
+from app.model.sys_model import SysUser
 from app.model.schemas.sys_user_schemas import SysUserPager, SysUserOut
 from app.common.bcrypt_pw import hash_password
 from app.db.page_util import get_pager
 
-from sqlalchemy import and_, desc
+from sqlalchemy import and_, asc
 from sqlalchemy.orm import Session
 
 
 def user_pager(user: SysUserPager, session: Session):
-    query = session.query(SysUser).order_by(desc(SysUser.id))
+    query = session.query(SysUser).order_by(asc(SysUser.id))
     filters = []
     if user.username is not None:
         filters.append(SysUser.username.ilike(f"%{user.username}%"))
-    if user.dept_id is not None:
-        filters.append(SysUser.dept_id == user.dept_id)
     if len(filters) > 0:
         query.filter(and_(*filters))
     pager = get_pager(query, user.pagerNum, user.pagerSize)
-    pager.data = [SysUserOut.from_orm(user) for user in pager.data]
+    pager.data = [SysUserOut.from_orm(user).dict() for user in pager.data]
     return pager
 
 
@@ -35,13 +33,13 @@ def get_user_by_id(id: int, session:  Session):
 
 def stop_user(user: SysUser, session:  Session):
     user.user_status = "1"
-    session.commit();
+    session.commit()
     return user
 
 
 def start_user(user: SysUser, session:  Session):
     user.user_status = "0"
-    session.commit();
+    session.commit()
     return user