''wip(semantic):调整序列化返回结果

applications/models/users/dept.py

@@ -1,3 +1,4 @@
+from flask_restful import fields
 from applications.extensions import db
 from ..base import BaseModel
 
@@ -7,10 +8,26 @@ class CompanyDepartment(db.Model, BaseModel):
     id = db.Column(db.Integer, primary_key=True, comment="部门ID")
     parent_id = db.Column(db.Integer, comment="父级编号")
     dept_name = db.Column(db.String(50), comment="部门名称")
-    sort = db.Column(db.Integer, comment="排序")
     leader = db.Column(db.String(50), comment="负责人")
     phone = db.Column(db.String(20), comment="联系方式")
     email = db.Column(db.String(50), comment="邮箱")
-    status = db.Column(db.Integer, comment='状态(1开启,0关闭)')
-    remark = db.Column(db.Text, comment="备注")
+    status = db.Column(db.Boolean, comment='状态(1开启,0关闭)')
+    comment = db.Column(db.Text, comment="备注")
     address = db.Column(db.String(255), comment="详细地址")
+    sort = db.Column(db.Integer, comment="排序")
+
+    @staticmethod
+    def fields():
+        return {
+            'deptId': fields.Integer(attribute="id"),
+            'parentId': fields.Integer(attribute="parent_id"),
+            'deptName': fields.String(attribute="dept_name"),
+            'sort': fields.Integer,
+            'leader': fields.String,
+            'phone': fields.String,
+            'email': fields.String,
+            'status': fields.Boolean,
+            'comment': fields.String,
+            'address': fields.String,
+            'create_at': fields.DateTime
+        }

applications/models/users/users.py

@@ -1,5 +1,6 @@
 from flask_login import UserMixin
 from werkzeug.security import generate_password_hash, check_password_hash
+from flask_restful import fields
 
 from applications.extensions import db
 from ..base import BaseModel
@@ -12,7 +13,7 @@ class CompanyUser(db.Model, UserMixin, BaseModel):
     realname = db.Column(db.String(20), comment='真实名字')
     mobile = db.Column(db.String(11), comment='电话号码')
     avatar = db.Column(db.String(255), comment='头像', default="/static/admin/admin/images/avatar.jpg")
-    remark = db.Column(db.String(255), comment='备注')
+    comment = db.Column(db.String(255), comment='备注')
     password_hash = db.Column(db.String(128), comment='哈希密码')
     enable = db.Column(db.Integer, default=0, comment='启用')
     dept_id = db.Column(db.Integer, comment='部门id')
@@ -24,3 +25,21 @@ class CompanyUser(db.Model, UserMixin, BaseModel):
 
     def validate_password(self, password):
         return check_password_hash(self.password_hash, password)
+
+    @staticmethod
+    def fields():
+        return {
+            'id': fields.Integer,
+            'username': fields.String,
+            'realname': fields.String,
+            'mobile': fields.String,
+            'avatar': fields.Url,
+            'comment': fields.String,
+            # 'password_hash': fields.String,
+            'enable': fields.Boolean,
+            # 'dept_id': fields.Integer,
+            'dept_id': fields.Integer,
+            'create_at': fields.DateTime,
+            'update_at': fields.DateTime,
+        }
+