修复过滤后count数量

applications/view/admin/dict.py

@@ -31,7 +31,7 @@ def dict_type_data():
     # orm查询
     # 使用分页获取data需要.items
     dict_all = DictType.query.filter(mf.get_filter(DictType)).layui_paginate()
-    count = DictType.query.count()
+    count = DictType.query.filter(mf.get_filter(DictType)).count()
     data = curd.model_to_dicts(schema=DictTypeSchema, data=dict_all.items)
     return table_api(data=data, count=count)
 

applications/view/admin/role.py

@@ -35,7 +35,7 @@ def table():
     # orm查询
     # 使用分页获取data需要.items
     role = Role.query.filter(mf.get_filter(Role)).layui_paginate()
-    count = Role.query.count()
+    count = Role.query.filter(mf.get_filter(Role)).count()
     # 返回api
     return table_api(data=model_to_dicts(schema=RoleSchema, data=role.items), count=count)
 

applications/view/admin/user.py

@@ -1,6 +1,6 @@
 from flask import Blueprint, render_template, request
 from flask_login import login_required, current_user
-from sqlalchemy import and_, desc
+from sqlalchemy import desc
 
 from applications.common import curd
 from applications.common.curd import model_to_dicts, enable_status, disable_status
@@ -9,8 +9,8 @@ from applications.common.utils.http import table_api, fail_api, success_api
 from applications.common.utils.rights import authorize
 from applications.common.utils.validate import xss_escape
 from applications.extensions import db
-from applications.models import User, AdminLog
 from applications.models import Role
+from applications.models import User, AdminLog
 from applications.schemas import UserSchema
 
 admin_user = Blueprint('adminUser', __name__, url_prefix='/admin/user')
@@ -42,7 +42,7 @@ def data():
     # orm查询
     # 使用分页获取data需要.items
     user = User.query.filter(mf.get_filter(model=User)).layui_paginate()
-    count = User.query.count()
+    count = User.query.filter(mf.get_filter(model=User)).count()
     # 返回api
     return table_api(data=model_to_dicts(schema=UserSchema, data=user.items), count=count)