Merge pull request #329 from f3n9/dev-um-8

修复用户管理页中"All Roles"不显示用户的问题

VERSION

@@ -1 +1 @@
-1.1.126
+1.1.127

src/routes/admin.js

@@ -30,7 +30,24 @@ const router = express.Router()
 router.get('/users', authenticateAdmin, async (req, res) => {
   try {
     const userService = require('../services/userService')
-    const result = await userService.getAllUsers({ isActive: true, limit: 1000 }) // Get all active users
+
+    // Extract query parameters for filtering
+    const { role, isActive } = req.query
+    const options = { limit: 1000 }
+
+    // Apply role filter if provided
+    if (role) {
+      options.role = role
+    }
+
+    // Apply isActive filter if provided, otherwise default to active users only
+    if (isActive !== undefined) {
+      options.isActive = isActive === 'true'
+    } else {
+      options.isActive = true // Default to active users for backwards compatibility
+    }
+
+    const result = await userService.getAllUsers(options)
 
     // Extract users array from the paginated result
     const allUsers = result.users || []

web/admin-spa/src/views/UserManagementView.vue

@@ -554,13 +554,17 @@ const formatDate = (dateString) => {
 const loadUsers = async () => {
   loading.value = true
   try {
-    const [usersResponse, statsResponse] = await Promise.all([
+    // Build params object, only including parameters with actual values
-      apiClient.get('/users', {
+    const params = {}
-        params: {
+    if (selectedRole.value && selectedRole.value.trim() !== '') {
-          role: selectedRole.value || undefined,
+      params.role = selectedRole.value
-          isActive: selectedStatus.value !== '' ? selectedStatus.value : undefined
     }
-      }),
+    if (selectedStatus.value !== '') {
+      params.isActive = selectedStatus.value
+    }
+
+    const [usersResponse, statsResponse] = await Promise.all([
+      apiClient.get('/users', { params }),
       apiClient.get('/users/stats/overview')
     ])