修改企业、员工返回的数据

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using OASystem.Domain.Entities.System;
+using System.Collections;
 
 namespace OASystem.API.Controllers
 {
@@ -67,6 +68,15 @@ namespace OASystem.API.Controllers
                         {
                             companyListView[i].ParentCompanyName = companyListView.Find(x => x.Id == companyListView[i].ParentCompanyId).CompanyName;
                         }
+                        if (companyListView[i].ContactUserId!=0)
+                        {
+                            var user = _userRep.QueryDto<Sys_Users,UserInfoWebView>(x => x.Id == companyListView[i].ContactUserId).ToList();
+                            if (user.Count!=0)
+                            {
+                                companyListView[i].ContactUserName = user[0].CnName;
+                            }
+                           
+                        }
 
                     }
                     return Ok(JsonView(true, "查询成功！", companyListView));
@@ -148,7 +158,7 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                if (string.IsNullOrWhiteSpace(dto.CompanyName) || string.IsNullOrWhiteSpace(dto.CompanyCode) || string.IsNullOrWhiteSpace(dto.Address) || dto.ParentCompanyId == 0 || dto.ContactUserId == 0)
+                if (string.IsNullOrWhiteSpace(dto.CompanyName) || string.IsNullOrWhiteSpace(dto.CompanyCode) || string.IsNullOrWhiteSpace(dto.Address)  || dto.ContactUserId == 0)
                 {
                     return Ok(JsonView(false, "请检查信息是否输入完整！"));
                 }
@@ -166,6 +176,7 @@ namespace OASystem.API.Controllers
                         ParentCompanyId = dto.ParentCompanyId,
                         Tel = dto.Tel,
                         ContactUserId = dto.ContactUserId,
+                        Remark=dto.Remark,
                     });
                     if (!res) { return Ok(JsonView(false, "修改失败")); }
                     return Ok(JsonView(true,"修改成功！"));
@@ -547,13 +558,17 @@ namespace OASystem.API.Controllers
                     Regex r = new Regex("And");
                     sqlWhere = r.Replace(sqlWhere, "Where", 1);
                 }
-                var result=_userRep.GetUserList(dto.PortType,sqlWhere);
-                if (result.Result.Code!=0)
+                string userSqlWhere = string.Format(@"Select sc.CompanyName,sd.DepName,sjp.JobName,su.* From Sys_Users su 
+                                                        Inner Join Sys_Company sc On su.CompanyId = sc.Id
+                                                        Inner Join Sys_Department sd On su.DepId = sd.Id
+                                                        Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id {0}", sqlWhere);
+                var _userList =_userRep.GetListBySqlWithNolock(userSqlWhere);
+                if (_userList.Count == 0)
                 {
                     return Ok(JsonView(false, "暂无数据！"));
 
                 }
-                return Ok(JsonView(true,"查询成功！",result.Result.Data));
+                return Ok(JsonView(true,"查询成功！", _userList));
             }
             catch (Exception)
             {

OASystem/OASystem.Domain/Dtos/System/CompanyDto.cs

@@ -118,6 +118,11 @@ namespace OASystem.Domain.Dtos.System
         /// </summary>
         public int ParentCompanyId { get; set; }
 
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
     }
 
     /// <summary>

OASystem/OASystem.Domain/ViewModels/CompanyView.cs

@@ -30,6 +30,10 @@ namespace OASystem.Domain.ViewModels
         /// </summary>
         public int ContactUserId { get; set; }
         /// <summary>
+        /// 负责人名字
+        /// </summary>
+        public string ContactUserName { get; set; }
+        /// <summary>
         /// 联系方式
         /// </summary>
         public string Tel { get; set; }
@@ -42,6 +46,10 @@ namespace OASystem.Domain.ViewModels
         /// 父级公司Name
         /// </summary>
         public string ParentCompanyName { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 
 }