From 3a73465365e9520abdd22ec237d2800b15b8d10a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E8=83=9C=E8=88=9F?= <1650473152@qq.com>
Date: Sat, 18 Feb 2023 23:10:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/view/admin/role.py |  3 +--
 applications/view/admin/user.py | 29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/applications/view/admin/role.py b/applications/view/admin/role.py
index d5c7928..85a5d1c 100644
--- a/applications/view/admin/role.py
+++ b/applications/view/admin/role.py
@@ -1,5 +1,6 @@
 from flask import Blueprint, render_template, request, jsonify
 from flask_login import login_required
+
 from applications.common.curd import model_to_dicts, enable_status, disable_status, get_one_by_id
 from applications.common.utils.http import table_api, success_api, fail_api
 from applications.common.utils.rights import authorize
@@ -7,7 +8,6 @@ from applications.common.utils.validate import str_escape
 from applications.extensions import db
 from applications.models import Role, Power, User
 from applications.schemas import RoleOutSchema, PowerOutSchema2
-
 admin_role = Blueprint('adminRole', __name__, url_prefix='/admin/role')
 
 
@@ -183,7 +183,6 @@ def remove(id):
 # 批量删除
 @admin_role.delete('/batchRemove')
 @authorize("admin:role:remove", log=True)
-@login_required
 def batch_remove():
     ids = request.form.getlist('ids[]')
     for id in ids:
diff --git a/applications/view/admin/user.py b/applications/view/admin/user.py
index b5af8fe..1757b88 100644
--- a/applications/view/admin/user.py
+++ b/applications/view/admin/user.py
@@ -40,19 +40,26 @@ def data():
         filters.append(User.realname == dept_id)
 
     # print(*filters)
-    data, count = db.session.query(
-        User.id,
-        User.username,
-        User.realname,
-        User.enable,
-        User.create_at,
-        User.update_at,
-        Dept.dept_name
-    ).filter(*filters).filter(User.dept_id == Dept.id).layui_paginate_db_json()
-    return table_api(data=data, count=count)
+    query = db.session.query(
+        User,
+        Dept
+    ).filter(*filters).filter(User.dept_id == Dept.id).layui_paginate()
+
+    return table_api(
+        data=[{
+            'id': user.id,
+            'username': user.username,
+            'realname': user.realname,
+            'enable': user.enable,
+            'create_at': user.create_at,
+            'update_at': user.update_at,
+            'dept_name': dept.dept_name
+        } for user, dept in query],
+        count=query.total)
+
+    # 用户增加
 
 
-# 用户增加
 @admin_user.get('/add')
 @authorize("admin:user:add", log=True)
 def add():