改造后台权限和APP权限

app/blueprints/admin.py

@@ -267,7 +267,8 @@ def admin_delete_user(uid):
 @login_required
 def admin_user_column_permissions(uid):
     """获取指定用户的栏目权限列表：当前用户只能查自己，管理员可查任意用户。超级管理员返回全部栏目。"""
-    current_uid = session.get('user_id')
+    current_uid = session.get('user_id')
+    menu_type = (request.args.get('menu_type') or '').strip().lower()
     if current_uid != uid:
         role, _ = _get_current_admin_role()
         if not role:
@@ -277,28 +278,44 @@ def admin_user_column_permissions(uid):
         with conn.cursor() as cur:
             cur.execute("SELECT role FROM users WHERE id = %s", (uid,))
             user_row = cur.fetchone()
-            if user_row and (user_row.get('role') or '').strip() == 'super_admin':
-                cur.execute("""
-                    SELECT id, name, column_key, created_at FROM columns ORDER BY id
-                """)
-                rows = cur.fetchall()
-            else:
-                cur.execute("""
-                    SELECT c.id, c.name, c.column_key, c.created_at
-                    FROM columns c
-                    INNER JOIN user_column_permission ucp ON ucp.column_id = c.id
-                    WHERE ucp.user_id = %s
-                    ORDER BY c.id
-                """, (uid,))
-                rows = cur.fetchall()
+            valid_menu_type = menu_type if menu_type in ('app', 'admin') else ''
+            if user_row and (user_row.get('role') or '').strip() == 'super_admin':
+                sql = """
+                    SELECT id, name, column_key, menu_type, route_path, sort_order, created_at
+                    FROM columns
+                """
+                params = []
+                if valid_menu_type:
+                    sql += " WHERE menu_type = %s"
+                    params.append(valid_menu_type)
+                sql += " ORDER BY sort_order ASC, id ASC"
+                cur.execute(sql, tuple(params))
+                rows = cur.fetchall()
+            else:
+                sql = """
+                    SELECT c.id, c.name, c.column_key, c.menu_type, c.route_path, c.sort_order, c.created_at
+                    FROM columns c
+                    INNER JOIN user_column_permission ucp ON ucp.column_id = c.id
+                    WHERE ucp.user_id = %s
+                """
+                params = [uid]
+                if valid_menu_type:
+                    sql += " AND c.menu_type = %s"
+                    params.append(valid_menu_type)
+                sql += " ORDER BY c.sort_order ASC, c.id ASC"
+                cur.execute(sql, tuple(params))
+                rows = cur.fetchall()
         conn.close()
         items = [
-            {
-                'id': r['id'],
-                'name': r['name'],
-                'column_key': r['column_key'],
-                'created_at': r['created_at'].strftime('%Y-%m-%d %H:%M') if r.get('created_at') else '',
-            }
+            {
+                'id': r['id'],
+                'name': r['name'],
+                'column_key': r['column_key'],
+                'menu_type': r.get('menu_type') or 'app',
+                'route_path': r.get('route_path') or '',
+                'sort_order': r.get('sort_order') or 0,
+                'created_at': r['created_at'].strftime('%Y-%m-%d %H:%M') if r.get('created_at') else '',
+            }
             for r in rows
         ]
         return jsonify({'success': True, 'items': items})

app/blueprints/main.py

@@ -50,10 +50,10 @@ def wb():
     return _render_html('index.html')
 
 
-@main_bp.route('/brand')
-@login_required
-def brand_page():
-    return _render_html('brand.html')
+@main_bp.route('/brand')
+@login_required
+def brand_page():
+    return _render_html('brand.html', user_id=session.get('user_id'))
 
 
 
@@ -161,4 +161,4 @@ def proxy(path):
         return Response("无法连接到后端服务", status=502)
     except Exception as e:
         print(f"代理请求失败: {e}")
-        return Response(f"代理错误: {str(e)}", status=500)
+        return Response(f"代理错误: {str(e)}", status=500)