xf 2 years ago
parent
commit
21dbc4591e

+ 2 - 0
src/Hotline.Api/Controllers/RoleController.cs

@@ -67,6 +67,8 @@ public class RoleController : BaseController
     {
         var jwtOption = _identityConfigurationAccessor.Value.Jwt;
         var clientId = jwtOption.Issuer;
+        if (string.IsNullOrEmpty(clientId))
+            throw new UserFriendlyException("jwt.Issuer未配置");
         var exists = await _roleRepository.Queryable(includeDeleted: true)
             .AnyAsync(d => d.ClientId == clientId && d.Name == dto.Name);
         if (exists)

+ 5 - 1
src/Hotline.Api/Controllers/UserController.cs

@@ -150,6 +150,8 @@ public class UserController : BaseController
         {
             account = _mapper.Map<Account>(dto);
             var jwtOptions = _identityConfigurationAccessor.Value.Jwt;
+            if (string.IsNullOrEmpty(jwtOptions.Issuer))
+                throw new UserFriendlyException("jwt.Issuer未配置");
             account.ClientId = jwtOptions.Issuer;
             await _accountRepository.AddAsync(account, HttpContext.RequestAborted);
             var user = _mapper.Map<User>(dto);
@@ -307,7 +309,9 @@ public class UserController : BaseController
     [HttpGet]
     public async Task<IReadOnlyList<UserDto>> Query([FromQuery] IReadOnlyList<string> ids)
     {
-        var users = await _userRepository.Queryable().ToListAsync(d => ids.Contains(d.Id));
+        var users = await _userRepository.Queryable()
+            .Where(d => ids.Contains(d.Id))
+            .ToListAsync();
         return _mapper.Map<IReadOnlyList<UserDto>>(users);
     }
 

+ 2 - 2
src/Hotline.Share/Enums/Order/EGender.cs

@@ -11,9 +11,9 @@ public enum EGender
     [Description("未知")]
     Unknown = 0,
 
-    [Description("男")]
+    [Description("男")]
     Male = 1,
     
-    [Description("女")]
+    [Description("女")]
     Female = 2,
 }