!16 简化分页取count

Merge pull request !16 from Rabbit/master

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)

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)
 

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)
 

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)