完成部门管理，增加.flaskenv配置，抽基本js和css作为引入模板

applications/service/admin/dept.py

@@ -0,0 +1,92 @@
+from markupsafe import escape, Markup
+
+from applications.models import db
+from applications.models.admin_dept import Dept, DeptSchema
+from applications.models.admin_user import User
+from applications.service.common.curd import model_to_dicts
+
+
+def get_dept_dict():
+    dept = Dept.query.order_by(Dept.sort).all()
+    res = model_to_dicts(Schema=DeptSchema, model=dept)
+    return res
+
+
+def save_dept(req):
+    address = req.get("address")
+    deptName = req.get("deptName")
+    email = req.get("email")
+    leader = req.get("leader")
+    parentId = req.get("parentId")
+    parentName = req.get("parentName")
+    phone = req.get("phone")
+    selectParent_select_input = req.get("selectParent_select_input")
+    sort = req.get("sort")
+    status = req.get("status")
+    dept = Dept(
+        parent_id=parentId,
+        dept_name=deptName,
+        sort=sort,
+        leader=leader,
+        phone=phone,
+        email=email,
+        status=status,
+        address=address
+    )
+    r = db.session.add(dept)
+    db.session.commit()
+    return r
+
+
+def get_dept_by_id(id):
+    d = Dept.query.filter_by(id=id).first()
+    return d
+
+
+# 启动权限
+def enable_status(id):
+    enable = 1
+    d = Dept.query.filter_by(id=id).update({"status": enable})
+    if d:
+        db.session.commit()
+        return True
+    print('0')
+    return False
+
+
+# 停用权限
+def disable_status(id):
+    enable = 0
+    d = Dept.query.filter_by(id=id).update({"status": enable})
+    if d:
+        db.session.commit()
+        return True
+    return False
+
+
+def update_dept(json):
+    id = json.get("deptId"),
+    print(str(Markup(json.get("leader"))))
+    data = {
+        "dept_name": json.get("deptName"),
+        "sort": json.get("sort"),
+        "leader": json.get("leader"),
+        "phone": json.get("phone"),
+        "email": json.get("email"),
+        "status": json.get("status"),
+        "address": json.get("address")
+    }
+    d = Dept.query.filter_by(id=id).update(data)
+    if not d:
+        return False
+    db.session.commit()
+    return True
+
+
+def remove_dept(id):
+    d = Dept.query.filter_by(id=id).delete()
+    if not d:
+        return False
+    User.query.filter_by(dept_id=id).update({"dept_id": None})
+    db.session.commit()
+    return True

applications/service/admin/power.py

@@ -1,22 +1,20 @@
 from applications.models import db
 from applications.models.admin_power import Power, PowerSchema2
 from applications.models.admin_role import Role
+from applications.service.common.curd import model_to_dicts
 
 
 def get_power_dict():
     power = Power.query.all()
-    power_schema = PowerSchema2(many=True)
-    power_dict = power_schema.dump(power)
-    return power_dict
-
+    res = model_to_dicts(Schema=PowerSchema2, model=power)
+    return res
 
 # 选择父节点
 def select_parent():
     power = Power.query.all()
-    power_schema = PowerSchema2(many=True)
-    power_dict = power_schema.dump(power)
-    power_dict.append({"powerId": 0, "powerName": "顶级权限", "parentId": -1})
-    return power_dict
+    res = model_to_dicts(Schema=PowerSchema2, model=power)
+    res.append({"powerId": 0, "powerName": "顶级权限", "parentId": -1})
+    return res
 
 
 # 增加权限

applications/service/admin/user.py

@@ -11,8 +11,13 @@ from applications.models.admin_log import AdminLog
 from applications.service.common.curd import model_to_dicts
 
 
-def get_user_data(page, limit, filters):
-    user = User.query.filter(and_(*[getattr(User, k).like(v) for k, v in filters.items()])).paginate(page=page,
+def get_user_data(page, limit, filters,deptId):
+    if deptId:
+        user = User.query.filter_by(dept_id=deptId).filter(and_(*[getattr(User, k).like(v) for k, v in filters.items()])).paginate(page=page,
+                                                                                                     per_page=limit,
+                                                                                                     error_out=False)
+    else:
+        user = User.query.filter(and_(*[getattr(User, k).like(v) for k, v in filters.items()])).paginate(page=page,
                                                                                                      per_page=limit,
                                                                                                      error_out=False)
     count = User.query.count()
@@ -20,8 +25,8 @@ def get_user_data(page, limit, filters):
 
 
 # 获取用户的dict数据分页器
-def get_user_data_dict(page, limit, filters):
-    user, count = get_user_data(page, limit, filters)
+def get_user_data_dict(page, limit, filters,deptId):
+    user, count = get_user_data(page, limit, filters,deptId)
     data = model_to_dicts(Schema=UserSchema,model=user.items)
     return data, count
 
@@ -70,8 +75,8 @@ def update_avatar(url):
 
 
 # 更新用户信息
-def update_user(id, username, realname):
-    user = User.query.filter_by(id=id).update({'username': username, 'realname': realname})
+def update_user(id, username, realname, deptId):
+    user = User.query.filter_by(id=id).update({'username': username, 'realname': realname,'dept_id':deptId})
     db.session.commit()
     return user