Platform upgrade: login auth fix, OCR/OSS upload, system menus and dicts, weather dashboard, weighing and invoice modules

backend/AgriculturalPlatform.Api/Controllers/UsersController.cs

@@ -20,7 +20,7 @@ public class UsersController(AppDbContext db, DataScopeService scope, CurrentUse
         [FromQuery] int page = 1, [FromQuery] int pageSize = 20, [FromQuery] string? keyword = null)
     {
         var visible = await scope.GetVisibleOrgIdsAsync(currentUser.Get());
-        var query = db.Users.Include(u => u.Org).AsQueryable();
+        var query = db.Users.Include(u => u.Org).Include(u => u.SysRole).AsQueryable();
         if (visible is not null)
             query = query.Where(u => u.OrgId != null && visible.Contains(u.OrgId.Value));
         if (!string.IsNullOrWhiteSpace(role) && Enum.TryParse<UserRole>(role, out var userRole))
@@ -54,12 +54,13 @@ public class UsersController(AppDbContext db, DataScopeService scope, CurrentUse
             RealName = req.RealName,
             Phone = req.Phone,
             Role = role,
+            RoleId = req.RoleId,
             OrgId = req.OrgId,
             IsActive = req.IsActive
         };
         db.Users.Add(user);
         await db.SaveChangesAsync();
-        return Ok((await db.Users.Include(u => u.Org).FirstAsync(u => u.Id == user.Id)).ToDto());
+        return Ok((await db.Users.Include(u => u.Org).Include(u => u.SysRole).FirstAsync(u => u.Id == user.Id)).ToDto());
     }
 
     /// <summary>修改用户</summary>
@@ -75,12 +76,13 @@ public class UsersController(AppDbContext db, DataScopeService scope, CurrentUse
         user.RealName = req.RealName;
         user.Phone = req.Phone;
         if (Enum.TryParse<UserRole>(req.Role, out var role)) user.Role = role;
+        user.RoleId = req.RoleId;
         user.OrgId = req.OrgId;
         user.IsActive = req.IsActive;
         if (!string.IsNullOrWhiteSpace(req.Password))
             user.PasswordHash = BCrypt.Net.BCrypt.HashPassword(req.Password);
         await db.SaveChangesAsync();
-        return Ok((await db.Users.Include(u => u.Org).FirstAsync(u => u.Id == user.Id)).ToDto());
+        return Ok((await db.Users.Include(u => u.Org).Include(u => u.SysRole).FirstAsync(u => u.Id == user.Id)).ToDto());
     }
 
     /// <summary>重置密码</summary>