更新数据包，新增岗位导出

Admin.Core.Repository/Base/DbHelper.cs

@@ -621,6 +621,12 @@ namespace Admin.Core.Repository
 
                 #endregion
 
+                #region 岗位
+
+                var positions = await db.Queryable<PositionEntity>().ToListAsync<PositionDataOutput>();
+
+                #endregion
+
                 #endregion
 
                 if (!(users?.Count > 0))
@@ -648,7 +654,8 @@ namespace Admin.Core.Repository
                     tenants,
                     tenantPermissions,
                     permissionApis,
-                    organizationTree
+                    organizationTree,
+                    positions
                 },
                 //Formatting.Indented,
                 settings

Admin.Core.Repository/Personnel/Organization/Output/OrganizationDataOutput.cs

@@ -18,7 +18,7 @@ namespace Admin.Core.Repository.Personnel.Output
         public long Id { get; set; }
 
         /// <summary>
-        /// 接口父级
+        /// 上级组织机构
         /// </summary>
         public long? ParentId { get; set; }
 

Admin.Core.Repository/Personnel/Position/Output/PositionDataOutput.cs

@@ -0,0 +1,43 @@
+namespace Admin.Core.Repository.Personnel.Output
+{
+    /// <summary>
+    /// 岗位导出
+    /// </summary>
+    public partial class PositionDataOutput
+    {
+        /// <summary>
+        /// 租户Id
+        /// </summary>
+        public long? TenantId { get; set; }
+
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 编码
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 说明
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 启用
+        /// </summary>
+		public bool Enabled { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+		public int Sort { get; set; }
+    }
+}

Admin.Core.Service/Admin/DictionaryType/DictionaryTypeService.cs

@@ -1,9 +1,11 @@
-using Admin.Core.Common.Input;
+using Admin.Core.Common.Attributes;
+using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
 using Admin.Core.Repository.Admin;
 using Admin.Core.Service.Admin.DictionaryType.Input;
 using Admin.Core.Service.Admin.DictionaryType.Output;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Admin.Core.Service.Admin.DictionaryType
@@ -11,10 +13,11 @@ namespace Admin.Core.Service.Admin.DictionaryType
     public class DictionaryTypeService : BaseService, IDictionaryTypeService
     {
         private readonly IDictionaryTypeRepository _DictionaryTypeRepository;
-
-        public DictionaryTypeService(IDictionaryTypeRepository DictionaryTypeRepository)
+        private readonly IDictionaryRepository _dictionaryRepository;
+        public DictionaryTypeService(IDictionaryTypeRepository DictionaryTypeRepository, IDictionaryRepository dictionaryRepository)
         {
             _DictionaryTypeRepository = DictionaryTypeRepository;
+            _dictionaryRepository = dictionaryRepository;
         }
 
         public async Task<IResponseOutput> GetAsync(long id)
@@ -68,29 +71,34 @@ namespace Admin.Core.Service.Admin.DictionaryType
             return ResponseOutput.Ok();
         }
 
+        [Transaction]
         public async Task<IResponseOutput> DeleteAsync(long id)
         {
-            var result = false;
-            if (id > 0)
-            {
-                result = (await _DictionaryTypeRepository.DeleteAsync(m => m.Id == id)) > 0;
-            }
+            //删除字典数据
+            await _dictionaryRepository.DeleteAsync(a => a.DictionaryTypeId == id);
+
+            //删除字典类型
+            await _DictionaryTypeRepository.DeleteAsync(a => a.Id == id);
 
-            return ResponseOutput.Result(result);
+            return ResponseOutput.Ok();
         }
 
+        [Transaction]
         public async Task<IResponseOutput> SoftDeleteAsync(long id)
         {
-            var result = await _DictionaryTypeRepository.SoftDeleteAsync(id);
+            await _dictionaryRepository.SoftDeleteAsync(a => a.DictionaryTypeId == id);
+            await _DictionaryTypeRepository.SoftDeleteAsync(id);
 
-            return ResponseOutput.Result(result);
+            return ResponseOutput.Ok();
         }
 
+        [Transaction]
         public async Task<IResponseOutput> BatchSoftDeleteAsync(long[] ids)
         {
-            var result = await _DictionaryTypeRepository.SoftDeleteAsync(ids);
+            await _dictionaryRepository.SoftDeleteAsync(a => ids.Contains(a.DictionaryTypeId));
+            await _DictionaryTypeRepository.SoftDeleteAsync(ids);
 
-            return ResponseOutput.Result(result);
+            return ResponseOutput.Ok();
         }
     }
 }

Admin.Core.Service/Personnel/Employee/EmployeeService.cs

@@ -113,31 +113,30 @@ namespace Admin.Core.Service.Personnel.Employee
             return ResponseOutput.Ok();
         }
 
+        [Transaction]
         public async Task<IResponseOutput> DeleteAsync(long id)
         {
-            var result = false;
-            if (id > 0)
-            {
-                result = (await _employeeRepository.DeleteAsync(m => m.Id == id)) > 0;
-            }
+            //删除员工附属部门
+            await _employeeOrganizationRepository.DeleteAsync(a => a.EmployeeId == id);
 
-            return ResponseOutput.Result(result);
+            //删除员工
+            await _employeeRepository.DeleteAsync(m => m.Id == id);
+
+            return ResponseOutput.Ok();
         }
 
-        [Transaction]
         public async Task<IResponseOutput> SoftDeleteAsync(long id)
         {
-            var result = await _employeeRepository.SoftDeleteAsync(id);
+            await _employeeRepository.SoftDeleteAsync(id);
 
-            return ResponseOutput.Result(result);
+            return ResponseOutput.Ok();
         }
 
-        [Transaction]
         public async Task<IResponseOutput> BatchSoftDeleteAsync(long[] ids)
         {
-            var result = await _employeeRepository.SoftDeleteAsync(ids);
+            await _employeeRepository.SoftDeleteAsync(ids);
 
-            return ResponseOutput.Result(result);
+            return ResponseOutput.Ok();
         }
     }
 }

Admin.Core/Admin.Core.xml

@@ -830,42 +830,42 @@
         </member>
         <member name="M:Admin.Core.Controllers.Personnel.EmployeeController.Get(System.Int64)">
             <summary>
-            查询单条用户
+            查询单条员工
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
         <member name="M:Admin.Core.Controllers.Personnel.EmployeeController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Personnel.EmployeeEntity})">
             <summary>
-            查询分页用户
+            查询分页员工
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:Admin.Core.Controllers.Personnel.EmployeeController.Add(Admin.Core.Service.Personnel.Employee.Input.EmployeeAddInput)">
             <summary>
-            新增用户
+            新增员工
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:Admin.Core.Controllers.Personnel.EmployeeController.Update(Admin.Core.Service.Personnel.Employee.Input.EmployeeUpdateInput)">
             <summary>
-            修改用户
+            修改员工
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
         <member name="M:Admin.Core.Controllers.Personnel.EmployeeController.SoftDelete(System.Int64)">
             <summary>
-            删除用户
+            删除员工
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
         <member name="M:Admin.Core.Controllers.Personnel.EmployeeController.BatchSoftDelete(System.Int64[])">
             <summary>
-            批量删除用户
+            批量删除员工
             </summary>
             <param name="ids"></param>
             <returns></returns>
@@ -887,8 +887,6 @@
             查询组织架构列表
             </summary>
             <param name="key"></param>
-            <param name="start"></param>
-            <param name="end"></param>
             <returns></returns>
         </member>
         <member name="M:Admin.Core.Controllers.Personnel.OrganizationController.Add(Admin.Core.Service.Personnel.Organization.Input.OrganizationAddInput)">

Admin.Core/Controllers/Personnel/EmployeeController.cs

@@ -21,7 +21,7 @@ namespace Admin.Core.Controllers.Personnel
         }
 
         /// <summary>
-        /// 查询单条用户
+        /// 查询单条员工
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -32,7 +32,7 @@ namespace Admin.Core.Controllers.Personnel
         }
 
         /// <summary>
-        /// 查询分页用户
+        /// 查询分页员工
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -44,7 +44,7 @@ namespace Admin.Core.Controllers.Personnel
         }
 
         /// <summary>
-        /// 新增用户
+        /// 新增员工
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -55,7 +55,7 @@ namespace Admin.Core.Controllers.Personnel
         }
 
         /// <summary>
-        /// 修改用户
+        /// 修改员工
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -66,7 +66,7 @@ namespace Admin.Core.Controllers.Personnel
         }
 
         /// <summary>
-        /// 删除用户
+        /// 删除员工
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -77,7 +77,7 @@ namespace Admin.Core.Controllers.Personnel
         }
 
         /// <summary>
-        /// 批量删除用户
+        /// 批量删除员工
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>