bwadmin/pear-admin-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(修复模型名)

Browse Source
This commit is contained in:
zhengxinonly
2022-03-11 21:26:36 +08:00
parent 5333a68416
commit 1e34ef339a
18 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/users/profile.py
+6 -6
View File
@@ -4,7 +4,7 @@ from flask_restful import Resource, reqparse
from common.utils.http import fail_api, success_api
from extensions import db
from models import UserModels
from models import UserModel
class UserStatusResource(Resource):
@@ -18,11 +18,11 @@ class UserStatusResource(Resource):
res = parser.parse_args()
if res.operate == 1:
user = UserModels.query.get(user_id)
user = UserModel.query.get(user_id)
user.enable = res.operate
message = success_api(message="启动成功")
else:
user = UserModels.query.filter_by(id=res.user_id).update({"enable": res.operate})
user = UserModel.query.filter_by(id=res.user_id).update({"enable": res.operate})
message = success_api(message="禁用成功")
if user:
db.session.commit()
@@ -36,7 +36,7 @@ class UserAvatarResource(Resource):
def put(self, user_id):
url = request.json.get("avatar").get("src")
ret = UserModels.query.get(user_id)
ret = UserModel.query.get(user_id)
ret.avatar = url
db.session.commit()
if not ret:
@@ -55,7 +55,7 @@ class UserInfoResource(Resource):
res = parser.parse_args()
ret = UserModels.query.get(user_id)
ret = UserModel.query.get(user_id)
ret.username = res.username
ret.realname = res.real_name
ret.remark = res.details
@@ -80,7 +80,7 @@ class UserPasswordResource(Resource):
return fail_api(message='确认密码不一致')
""" 修改当前用户密码 """
user = UserModels.query.get(user_id)
user = UserModel.query.get(user_id)
is_right = user.validate_password(res.oldPassword)
if not is_right:
return jsonify(success=False, message="旧密码错误")
applications/users/user.py
+22 -22
View File
@@ -5,7 +5,7 @@ from sqlalchemy import desc
from common.utils.http import fail_api, success_api, table_api
from extensions import db
from models import UserModels, RoleModels, DepartmentModels
from models import UserModel, RoleModel, DepartmentModel
from models import LogModel
@@ -18,20 +18,20 @@ def get_current_user_logs():
def is_user_exists(username):
""" 判断用户是否存在 """
res = UserModels.query.filter_by(username=username).count()
res = UserModel.query.filter_by(username=username).count()
return bool(res)
def delete_by_id(_id):
""" 删除用户 """
user = UserModels.query.filter_by(id=_id).first()
user = UserModel.query.filter_by(id=_id).first()
roles_id = []
for role in user.role:
roles_id.append(role.id)
roles = RoleModels.query.filter(RoleModels.id.in_(roles_id)).all()
roles = RoleModel.query.filter(RoleModel.id.in_(roles_id)).all()
for r in roles:
user.role.remove(r)
res = UserModels.query.filter_by(id=_id).delete()
res = UserModel.query.filter_by(id=_id).delete()
db.session.commit()
return res
@@ -43,14 +43,14 @@ def batch_remove(ids):
def update_user_role(_id, roles_list):
user = UserModels.query.filter_by(id=_id).first()
user = UserModel.query.filter_by(id=_id).first()
roles_id = []
for role in user.role:
roles_id.append(role.id)
roles = RoleModels.query.filter(RoleModels.id.in_(roles_id)).all()
roles = RoleModel.query.filter(RoleModel.id.in_(roles_id)).all()
for r in roles:
user.role.remove(r)
roles = RoleModels.query.filter(RoleModels.id.in_(roles_list)).all()
roles = RoleModel.query.filter(RoleModel.id.in_(roles_list)).all()
for r in roles:
user.role.append(r)
db.session.commit()
@@ -72,17 +72,17 @@ class UserUsersResource(Resource):
filters = []
if res.real_name:
filters.append(UserModels.realname.like('%' + res.real_name + '%'))
filters.append(UserModel.realname.like('%' + res.real_name + '%'))
if res.username:
filters.append(UserModels.username.like('%' + res.username + '%'))
filters.append(UserModel.username.like('%' + res.username + '%'))
if res.dept_id:
filters.append(UserModels.dept_id == res.dept_id)
filters.append(UserModel.dept_id == res.dept_id)
paginate = UserModels.query.filter(*filters).paginate(page=res.page,
per_page=res.limit,
error_out=False)
paginate = UserModel.query.filter(*filters).paginate(page=res.page,
per_page=res.limit,
error_out=False)
dept_name = lambda dept_id: DepartmentModels.query.filter_by(id=dept_id).first().dept_name if dept_id else ""
dept_name = lambda dept_id: DepartmentModel.query.filter_by(id=dept_id).first().dept_name if dept_id else ""
user_data = [{
'id': item.id,
'username': item.username,
@@ -111,7 +111,7 @@ class UserUsersResource(Resource):
if is_user_exists(res.username):
return fail_api(message="用户已经存在")
user = UserModels()
user = UserModel()
user.username = res.username
user.realname = res.real_name
user.set_password(res.password)
@@ -119,8 +119,8 @@ class UserUsersResource(Resource):
db.session.commit()
""" 增加用户角色 """
user = UserModels.query.filter_by(id=user.id).first()
roles = RoleModels.query.filter(RoleModels.id.in_(role_ids)).all()
user = UserModel.query.filter_by(id=user.id).first()
roles = RoleModel.query.filter(RoleModel.id.in_(role_ids)).all()
for r in roles:
user.role.append(r)
db.session.commit()
@@ -152,7 +152,7 @@ class UserUserResource(Resource):
if is_user_exists(res.username):
return fail_api(message="用户已经存在")
user = UserModels()
user = UserModel()
user.username = res.username
user.realname = res.real_name
user.set_password(res.password)
@@ -160,8 +160,8 @@ class UserUserResource(Resource):
db.session.commit()
""" 增加用户角色 """
user = UserModels.query.filter_by(id=user.id).first()
roles = RoleModels.query.filter(RoleModels.id.in_(role_ids)).all()
user = UserModel.query.filter_by(id=user.id).first()
roles = RoleModel.query.filter(RoleModel.id.in_(role_ids)).all()
for r in roles:
user.role.append(r)
db.session.commit()
@@ -189,7 +189,7 @@ class UserRoleResource(Resource):
role_ids = res.role_ids.split(',')
# 更新用户数据
UserModels.query.filter_by(id=user_id).update({'username': res.username,
UserModel.query.filter_by(id=user_id).update({'username': res.username,
'realname': res.real_name,
'dept_id': res.dept_id})
db.session.commit()