wip(semantic):数据模型语义化

applications/api/department.py

@@ -4,7 +4,7 @@ from applications.api import api_bp
 from applications.common.utils.http import success_api, fail_api
 from applications.common.utils.rights import authorize
 from applications.extensions import db
-from applications.models import Dept, User
+from applications.models import CompanyDepartment, CompanyUser
 from flask_restful import marshal, reqparse
 from applications.common.serialization import dept_fields
 
@@ -16,7 +16,7 @@ class Department(Resource):
 
     @authorize("admin:dept:main", log=True)
     def get(self):
-        dept_data = Dept.query.order_by(Dept.sort).all()
+        dept_data = CompanyDepartment.query.order_by(CompanyDepartment.sort).all()
         # TODO dtree 需要返回状态信息
         res = {
             "status": {"code": 200, "message": "默认"},
@@ -38,7 +38,7 @@ class Department(Resource):
 
         res = parser.parse_args()
 
-        dept = Dept(
+        dept = CompanyDepartment(
             parent_id=res.parent_id,
             dept_name=res.dept_name,
             sort=res.sort,
@@ -58,7 +58,7 @@ class Department(Resource):
 class DeptURD(Resource):
     @authorize("admin:dept:edit", log=True)
     def get(self, dept_id):
-        dept = Dept.query.filter_by(id=dept_id).first()
+        dept = CompanyDepartment.query.filter_by(id=dept_id).first()
         dept_data = {
             'id': dept.id,
             'dept_name': dept.dept_name,
@@ -93,7 +93,7 @@ class DeptURD(Resource):
             "status": res.status,
             "address": res.address
         }
-        res = Dept.query.filter_by(id=dept_id).update(data)
+        res = CompanyDepartment.query.filter_by(id=dept_id).update(data)
         if not res:
             return fail_api(msg="更新失败")
         db.session.commit()
@@ -101,8 +101,8 @@ class DeptURD(Resource):
 
     @authorize("admin:dept:remove", log=True)
     def delete(self, dept_id):
-        ret = Dept.query.filter_by(id=dept_id).delete()
-        User.query.filter_by(dept_id=dept_id).update({"dept_id": None})
+        ret = CompanyDepartment.query.filter_by(id=dept_id).delete()
+        CompanyUser.query.filter_by(dept_id=dept_id).update({"dept_id": None})
         db.session.commit()
         if ret:
             return success_api(msg="删除成功")
@@ -113,7 +113,7 @@ class DeptURD(Resource):
 class DeptEnable(Resource):
     @authorize("admin:dept:edit", log=True)
     def put(self, dept_id):
-        d = Dept.query.get(dept_id)
+        d = CompanyDepartment.query.get(dept_id)
         if d:
             d.status = not d.status
             db.session.commit()