Ver código fonte

优化权限、用户、员工数据映射

zhontai 3 anos atrás
pai
commit
f636a77385

+ 1 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/ZhonTai.Plate.Admin.HttpApi.csproj

@@ -6,6 +6,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>F:\zhontai\Admin\src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.HttpApi\ZhonTai.Plate.Admin.HttpApi.xml</DocumentationFile>
+    <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

+ 1 - 0
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/ZhonTai.Plate.Admin.Service.Contracts.csproj

@@ -7,6 +7,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>F:\zhontai\Admin\src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.Service.Contracts\ZhonTai.Plate.Admin.Service.Contracts.xml</DocumentationFile>
+    <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
 	<ItemGroup>

+ 2 - 4
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Permission/PermissionService.cs

@@ -97,12 +97,10 @@ namespace ZhonTai.Plate.Admin.Service.Permission
 
         public async Task<IResultOutput> GetDotAsync(long id)
         {
-            var entity = await _permissionRepository.Select
+            var output = await _permissionRepository.Select
             .WhereDynamic(id)
             .IncludeMany(a => a.Apis.Select(b => new ApiEntity { Id = b.Id }))
-            .ToOneAsync();
-
-            var output = Mapper.Map<PermissionGetDotOutput>(entity);
+            .ToOneAsync(a => new PermissionGetDotOutput { ApiIds = a.Apis.Select(b => b.Id).ToArray() });
 
             return ResultOutput.Ok(output);
         }

+ 4 - 6
src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/User/UserService.cs

@@ -66,12 +66,10 @@ namespace ZhonTai.Plate.Admin.Service.User
 
         public async Task<IResultOutput> GetAsync(long id)
         {
-            var entity = await _userRepository.Select
+            var entityDto = await _userRepository.Select
             .WhereDynamic(id)
             .IncludeMany(a => a.Roles.Select(b => new RoleEntity { Id = b.Id }))
-            .ToOneAsync();
-
-            var entityDto = Mapper.Map<UserGetOutput>(entity);
+            .ToOneAsync(a => new UserGetOutput { RoleIds = a.Roles.Select(b => b.Id).ToArray() });
 
             var roles = await _roleRepository.Select.ToListAsync(a => new { a.Id, a.Name });
 
@@ -119,11 +117,11 @@ namespace ZhonTai.Plate.Admin.Service.User
             .OrderByDescending(true, a => a.Id)
             .IncludeMany(a => a.Roles.Select(b => new RoleEntity { Name = b.Name }))
             .Page(input.CurrentPage, input.PageSize)
-            .ToListAsync();
+            .ToListAsync(a => new UserListOutput { RoleNames = a.Roles.Select(b=>b.Name).ToArray() });
 
             var data = new PageOutput<UserListOutput>()
             {
-                List = Mapper.Map<List<UserListOutput>>(list),
+                List = list,
                 Total = total
             };
 

+ 10 - 2
src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/Employee/EmployeeService.cs

@@ -82,7 +82,11 @@ namespace ZhonTai.Plate.Personnel.Service.Employee
             //附属部门
             if (input.OrganizationIds != null && input.OrganizationIds.Any())
             {
-                var organizations = input.OrganizationIds.Select(organizationId => new EmployeeOrganizationEntity { EmployeeId = employeeId.Value, OrganizationId = organizationId });
+                var organizations = input.OrganizationIds.Select(organizationId => new EmployeeOrganizationEntity 
+                { 
+                    EmployeeId = employeeId.Value, 
+                    OrganizationId = organizationId 
+                });
                 await _employeeOrganizationRepository.InsertAsync(organizations);
             }
 
@@ -111,7 +115,11 @@ namespace ZhonTai.Plate.Personnel.Service.Employee
             //附属部门
             if (input.OrganizationIds != null && input.OrganizationIds.Any())
             {
-                var organizations = input.OrganizationIds.Select(organizationId => new EmployeeOrganizationEntity { EmployeeId = employee.Id, OrganizationId = organizationId });
+                var organizations = input.OrganizationIds.Select(organizationId => new EmployeeOrganizationEntity 
+                { 
+                    EmployeeId = employee.Id, 
+                    OrganizationId = organizationId 
+                });
                 await _employeeOrganizationRepository.InsertAsync(organizations);
             }