From e0c9621e56517f3e2255f454c3eb15be21dc43d5 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 23 May 2024 14:45:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Sys/Identity/Request/UserCreateRequest.cs       | 6 +++---
 Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Src/Dlhis.Sys/Identity/Request/UserCreateRequest.cs b/Src/Dlhis.Sys/Identity/Request/UserCreateRequest.cs
index 4ed87938..3d08abd0 100644
--- a/Src/Dlhis.Sys/Identity/Request/UserCreateRequest.cs
+++ b/Src/Dlhis.Sys/Identity/Request/UserCreateRequest.cs
@@ -20,11 +20,11 @@ public class UserCreateRequest
     /// <summary>
     /// 厂区
     /// </summary>
-    [Required]
-    public string Tenant { get; set; }
+    [MinLength(1, ErrorMessage = "请明确厂区")]
+    public List<string> Tenants { get; set; }
 
     /// <summary>
     /// 名称
     /// </summary>
     public string Name { get; set; }
-}
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs
index 3381e7d7..c1bb80ce 100644
--- a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs
+++ b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs
@@ -30,7 +30,7 @@ public class UserService : IUserService
             .LeftJoin<UserRoleEntity>((x, ur) => x.Id == ur.UserId)
             .LeftJoin<RoleEntity>((x, ur, r) => ur.RoleId == r.Id)
             .LeftJoin<UserClaimEntity>((x, ur, r, c) => x.Id == c.UserId && c.ClaimType == "preferred_username")
-            .LeftJoin<UserClaimEntity>((x, ur, r, c, cc) => x.Id == c.UserId && c.ClaimType == "tenant")
+            .LeftJoin<UserClaimEntity>((x, ur, r, c, cc) => x.Id == cc.UserId && cc.ClaimType == "tenant")
             .Where(x => x.UserName != "admin")
             .Where((x, ur, r, c, cc) => cc.ClaimValue == tenant)
             .WhereIF(request.IsOperator, (x, ur, r, c) => !SqlFunc.IsNullOrEmpty(r.Name))
@@ -116,11 +116,11 @@ public class UserService : IUserService
 
         var id = (int)await _dbContext.InsertReturnIdentityAsync(user);
 
-        await _dbContext.InsertAsync(new UserTenantEntity
+        await _dbContext.InsertAsync(request.Tenants.Select(x => new UserTenantEntity
         {
-            TenantCode = request.Tenant,
+            TenantCode = x,
             UserId = id
-        });
+        }).ToList());
 
         if (request.Name.IsPresent())
         {