修改人事相关表名

src/hosts/ZhonTai.Host/ZhonTai.Host.csproj

@@ -43,7 +43,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="InitData\Admin\" />
     <Folder Include="Properties\PublishProfiles\" />
   </ItemGroup>
 

src/platform/ZhonTai.Admin/Domain/Employee/EmployeeEntity.cs

@@ -10,7 +10,7 @@ namespace ZhonTai.Admin.Domain.Employee
     /// <summary>
     /// 员工
     /// </summary>
-	[Table(Name = "pe_employee")]
+	[Table(Name = "ad_employee")]
     [Index("idx_{tablename}_01", nameof(Code) + "," + nameof(TenantId), true)]
     public partial class EmployeeEntity : EntityFull, ITenant
     {

src/platform/ZhonTai.Admin/Domain/EmployeeOrganization/EmployeeOrganizationEntity.cs

@@ -8,7 +8,7 @@ namespace ZhonTai.Admin.Domain
     /// <summary>
     /// 员工附属部门
     /// </summary>
-	[Table(Name = "pe_employee_organization")]
+	[Table(Name = "ad_employee_organization")]
     [Index("idx_{tablename}_01", nameof(EmployeeId) + "," + nameof(OrganizationId), true)]
     public partial class EmployeeOrganizationEntity : EntityAdd
     {

src/platform/ZhonTai.Admin/Domain/Organization/OrganizationEntity.cs

@@ -8,7 +8,7 @@ namespace ZhonTai.Admin.Domain.Organization
     /// <summary>
     /// 组织架构
     /// </summary>
-	[Table(Name = "pe_organization")]
+	[Table(Name = "ad_organization")]
     [Index("idx_{tablename}_01", nameof(ParentId) + "," + nameof(Name) + "," + nameof(TenantId), true)]
     public partial class OrganizationEntity : EntityFull, ITenant
     {

src/platform/ZhonTai.Admin/Domain/Position/PositionEntity.cs

@@ -7,7 +7,7 @@ namespace ZhonTai.Admin.Domain.Position
     /// <summary>
     /// 职位
     /// </summary>
-	[Table(Name = "pe_position")]
+	[Table(Name = "ad_position")]
     [Index("idx_{tablename}_01", nameof(Name) + "," + nameof(TenantId), true)]
     [Index("idx_{tablename}_02", nameof(Code) + "," + nameof(TenantId), true)]
     public partial class PositionEntity : EntityFull, ITenant

src/platform/ZhonTai.Admin/Repositories/CustomGenerateData.cs

@@ -228,12 +228,12 @@ namespace ZhonTai.Admin.Repositories
             SaveDataToJsonFile<EmployeeEntity>(employees, isTenant);
             if (isTenant)
             {
-                var tenantId = tenants.Where(a => a.Code.ToLower() == "zhontai").FirstOrDefault()?.Id;
-                SaveDataToJsonFile<DictionaryEntity>(dictionaries.Where(a => a.TenantId == tenantId));
-                SaveDataToJsonFile<DictionaryTypeEntity>(dictionaryTypes.Where(a => a.TenantId == tenantId));
-                SaveDataToJsonFile<UserEntity>(users.Where(a => a.TenantId == tenantId), false);
-                SaveDataToJsonFile<RoleEntity>(roles.Where(a => a.TenantId == tenantId));
-                organizationTree = organizations.Clone().Where(a => a.TenantId == tenantId).ToList().ToTree((r, c) =>
+                var tenantIds = tenants?.Select(a => a.Id)?.ToList();
+                SaveDataToJsonFile<DictionaryEntity>(dictionaries.Where(a => tenantIds.Contains(a.TenantId.Value)));
+                SaveDataToJsonFile<DictionaryTypeEntity>(dictionaryTypes.Where(a => tenantIds.Contains(a.TenantId.Value)));
+                SaveDataToJsonFile<UserEntity>(users.Where(a => tenantIds.Contains(a.TenantId.Value)), false);
+                SaveDataToJsonFile<RoleEntity>(roles.Where(a => tenantIds.Contains(a.TenantId.Value)));
+                organizationTree = organizations.Clone().Where(a => tenantIds.Contains(a.TenantId.Value)).ToList().ToTree((r, c) =>
                 {
                     return c.ParentId == 0;
                 },
@@ -247,8 +247,8 @@ namespace ZhonTai.Admin.Repositories
                     r.Childs.AddRange(datalist);
                 });
                 SaveDataToJsonFile<OrganizationEntity>(organizationTree);
-                SaveDataToJsonFile<PositionEntity>(positions.Where(a => a.TenantId == tenantId));
-                SaveDataToJsonFile<EmployeeEntity>(employees.Where(a => a.TenantId == tenantId));
+                SaveDataToJsonFile<PositionEntity>(positions.Where(a => tenantIds.Contains(a.TenantId.Value)));
+                SaveDataToJsonFile<EmployeeEntity>(employees.Where(a => tenantIds.Contains(a.TenantId.Value)));
             }
             SaveDataToJsonFile<UserRoleEntity>(userRoles);
             SaveDataToJsonFile<ApiEntity>(apiTree);