修改员工查询（新增条件）修改企业查询返回数据

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -60,8 +60,16 @@ namespace OASystem.API.Controllers
                     {
                         return Ok(JsonView(CompanyDataResult.Msg));
                     }
+                    List<CompanyView> companyListView = _mapper.Map<List<CompanyView>>(CompanyDataResult.Data);
+                    for (int i = 0; i < companyListView.Count; i++)
+                    {
+                        if (companyListView[i].ParentCompanyId != 0)
+                        {
+                            companyListView[i].ParentCompanyName = companyListView.Find(x => x.Id == companyListView[i].ParentCompanyId).CompanyName;
+                        }
 
-                    return Ok(JsonView(true, "查询成功！", CompanyDataResult.Data));
+                    }
+                    return Ok(JsonView(true, "查询成功！", companyListView));
                 }
                 else if (dto.PortType == 2)
                 {
@@ -530,6 +538,10 @@ namespace OASystem.API.Controllers
                 {
                     sqlWhere += string.Format(@" And su.DepId={0}", dto.DepId);
                 }
+                if (dto.JobPostId != 0)
+                {
+                    sqlWhere += string.Format(@" And su.JobPostId={0}", dto.JobPostId);
+                }
                 if (!string.IsNullOrEmpty(sqlWhere.Trim()))
                 {
                     Regex r = new Regex("And");
@@ -724,7 +736,11 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(200, "成功！", Dyresult));
         }
-
+        /// <summary>
+        /// 获取职务权限
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public IActionResult QueryJobAuth(QueryJobAuthDto dto)
@@ -773,7 +789,11 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(200, "成功!", viewData));
         }
-
+        /// <summary>
+        /// 保存岗位权限
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> SaveJobAuth(SaveJobDto dto)

OASystem/OASystem.Domain/Dtos/System/UserDto.cs

@@ -20,6 +20,11 @@ namespace OASystem.Domain.Dtos.System
         /// 部门Id
         /// </summary>
         public int DepId { get;set; }
+
+        /// <summary>
+        /// 岗位Id
+        /// </summary>
+        public int JobPostId { get; set; }
     }
     /// <summary>
     /// 修改用户信息

OASystem/OASystem.Domain/Entities/System/Sys_Company.cs

@@ -4,19 +4,19 @@
     /// 公司表
     /// </summary>
     [SugarTable("Sys_Company")]
-    public class Sys_Company: EntityBase
+    public class Sys_Company : EntityBase
     {
         /// <summary>
         /// 公司Code
         /// </summary>
-        [SugarColumn(IsNullable =true,ColumnDataType ="varchar(20)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
         public string CompanyCode { get; set; }
         /// <summary>
         /// 公司名称
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string CompanyName { get; set; }
-       
+
         /// <summary>
         /// 公司所在地
         /// </summary>
@@ -25,19 +25,18 @@
         /// <summary>
         /// 负责人Id
         /// </summary>
-        [SugarColumn(IsNullable =true, ColumnDataType = "int")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int ContactUserId { get; set; }
         /// <summary>
         /// 联系方式
         /// </summary>
-        [SugarColumn(IsNullable =true, ColumnDataType = "varchar(30)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string Tel { get; set; }
         /// <summary>
         /// 父级公司Id
         /// </summary>
-        [SugarColumn(IsNullable =true, ColumnDataType = "int")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int ParentCompanyId { get; set; }
     }
 
-    
 }

OASystem/OASystem.Domain/ViewModels/CompanyView.cs

@@ -1,4 +1,5 @@
 using OASystem.Domain.Entities.System;
+using System.Text.RegularExpressions;
 
 namespace OASystem.Domain.ViewModels
 {
@@ -8,7 +9,7 @@ namespace OASystem.Domain.ViewModels
     public class CompanyView
     {
         /// <summary>
-        /// 公司id
+        /// 公司Id
         /// </summary>
         public int Id { get; set; }
         /// <summary>
@@ -19,9 +20,28 @@ namespace OASystem.Domain.ViewModels
         /// 公司名称
         /// </summary>
         public string CompanyName { get; set; }
+
+        /// <summary>
+        /// 公司所在地
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        /// 负责人Id
+        /// </summary>
+        public int ContactUserId { get; set; }
+        /// <summary>
+        /// 联系方式
+        /// </summary>
+        public string Tel { get; set; }
+        
         /// <summary>
         /// 父级公司Id
         /// </summary>
         public int ParentCompanyId { get; set; }
+        /// <summary>
+        /// 父级公司Name
+        /// </summary>
+        public string ParentCompanyName { get; set; }
     }
+
 }

OASystem/OASystem.Infrastructure/Repositories/System/CompanyRepository.cs

@@ -30,13 +30,7 @@ namespace OASystem.Infrastructure.Repositories.System
 
             result.Code = 0;
             result.Msg = "成功！";
-            result.Data = DBdata.Select(x=> new CompanyView
-            {
-                CompanyCode = x.CompanyCode,
-                CompanyName = x.CompanyName,
-                Id = x.Id,
-                ParentCompanyId = x.ParentCompanyId
-            });
+            result.Data = DBdata;
             return result;
         }