diff --git a/applications/view/admin/admin_log.py b/applications/view/admin/admin_log.py index 28f4ac85866cc924f52ab41912257719e57d03f5..11896a52288cd1fe32846feb3172483d4945347f 100644 --- a/applications/view/admin/admin_log.py +++ b/applications/view/admin/admin_log.py @@ -23,7 +23,7 @@ def login_log(): # orm查询 # 使用分页获取data需要.items log = AdminLog.query.filter_by(url='/passport/login').order_by(desc(AdminLog.create_time)).layui_paginate() - count = AdminLog.query.filter_by(url='/passport/login').count() + count = log.total return table_api(data= model_to_dicts(schema=LogSchema, data=log.items), count=count) @@ -36,5 +36,5 @@ def operate_log(): log = AdminLog.query.filter( AdminLog.url != '/passport/login').order_by( desc(AdminLog.create_time)).layui_paginate() - count = AdminLog.query.filter(AdminLog.url != '/passport/login').count() + count = log.total return table_api(data=model_to_dicts(schema=LogSchema, data=log.items), count=count) diff --git a/applications/view/admin/dict.py b/applications/view/admin/dict.py index 6222e81791a598f50df2374e4627e9aa9260e3cd..7876ac7cb1c74da34bd159104c0664219c3e3095 100644 --- a/applications/view/admin/dict.py +++ b/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.filter(mf.get_filter(DictType)).count() + count = dict_all.total data = curd.model_to_dicts(schema=DictTypeSchema, data=dict_all.items) return table_api(data=data, count=count) @@ -117,7 +117,7 @@ def dict_type_delete(_id): def dict_code_data(): type_code = xss_escape(request.args.get('typeCode', type=str)) dict_data = DictData.query.filter_by(type_code=type_code).layui_paginate() - count = DictType.query.count() + count = dict_data.total data = curd.model_to_dicts(schema=DictDataSchema, data=dict_data.items) return table_api(data=data, count=count) diff --git a/applications/view/admin/role.py b/applications/view/admin/role.py index 4d23c7cf13623306eb3eee9bc7a15e96255da753..8fb457cda574b7904d4b877ec43beaa38df53fdf 100644 --- a/applications/view/admin/role.py +++ b/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.filter(mf.get_filter(Role)).count() + count = role.total # 返回api return table_api(data=model_to_dicts(schema=RoleSchema, data=role.items), count=count) diff --git a/applications/view/admin/user.py b/applications/view/admin/user.py index 2a6d9e07c6211fbcd4eaee3a316ca9eec086fb55..41e540508c832156e4647aa1888d031af82e10dc 100644 --- a/applications/view/admin/user.py +++ b/applications/view/admin/user.py @@ -42,7 +42,7 @@ def data(): # orm查询 # 使用分页获取data需要.items user = User.query.filter(mf.get_filter(model=User)).layui_paginate() - count = User.query.filter(mf.get_filter(model=User)).count() + count = user.total # 返回api return table_api(data=model_to_dicts(schema=UserSchema, data=user.items), count=count)