Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -236,12 +236,53 @@ namespace OASystem.API.Controllers
             {
                 if (dto.PortType==1)
                 {
-                    var result = _sysDepRep.QueryDto<Sys_Department, DepartmentIView>(s => s.CompanyId == dto.CompanyId).ToList();
-                    if (result.Count == 0)
+                    if (dto.CompanyId!=0)
                     {
-                        return Ok(JsonView(false, "暂无数据！"));
+                        var result = _sysDepRep.QueryDto<Sys_Department, DepartmentIView>(s => s.CompanyId == dto.CompanyId).ToList();
+                        if (result.Count == 0)
+                        {
+
+                            return Ok(JsonView(false, "暂无数据！"));
+                        }
+                        for (int i = 0; i < result.Count; i++)
+                        {
+                            if (result[i].ParentDepId != 0)
+                            {
+                                result[i].ParentDepName = result.Find(x => x.Id == result[i].ParentDepId).ParentDepName;
+                            }
+                            var company = _sysDepRep.QueryDto<Sys_Company, CompanyView>(s => s.Id == result[i].CompanyId).ToList();
+                            if (company.Count != 0)
+                            {
+                                result[i].CompanyName = company[0].CompanyName;
+                            }
+                            return Ok(JsonView(true, "查询成功！", result));
+                        }
                     }
-                    return Ok(JsonView(true, "查询成功！", result));
+                    else
+                    {
+                        var result = _sysDepRep.QueryDto<Sys_Department, DepartmentIView>(s => s.IsDel <=1).ToList();
+                        if (result.Count == 0)
+                        {
+
+                            return Ok(JsonView(false, "暂无数据！"));
+                        }
+                        for (int i = 0; i < result.Count; i++)
+                        {
+                            if (result[i].ParentDepId != 0)
+                            {
+                                result[i].ParentDepName = result.Find(x => x.Id == result[i].ParentDepId).ParentDepName;
+                            }
+                            var company = _sysDepRep.QueryDto<Sys_Company, CompanyView>(s => s.Id == result[i].CompanyId).ToList();
+                            if (company.Count != 0)
+                            {
+                                result[i].CompanyName = company[0].CompanyName;
+                            }
+                        }
+                        return Ok(JsonView(true, "查询成功！", result));
+                    }
+                    return Ok(JsonView(false, "暂无数据！"));
+
+
                 }
                 else if (dto.PortType==2)
                 {
@@ -569,10 +610,11 @@ namespace OASystem.API.Controllers
                 var _userList =_userRep.GetListBySqlWithNolock(userSqlWhere);
                 if (_userList.Count == 0)
                 {
+                    
                     return Ok(JsonView(false, "暂无数据！"));
-
                 }
-                return Ok(JsonView(true,"查询成功！", _userList));
+                List<UserInfoWebView> userList = _mapper.Map<List<UserInfoWebView>>(_userList);
+                return Ok(JsonView(true,"查询成功！", userList));
             }
             catch (Exception)
             {
@@ -848,13 +890,13 @@ namespace OASystem.API.Controllers
 
                 //获取所有职位员工
                 var jobUserAll = await QueryUserList(new UserDto { PortType = 2, JobPostId = dto.Jpid });
-                List<UserInfo> users = null;
+                List<UserInfoWebView> users = null;
                 var QueryUserListApiResult = (((jobUserAll as OkObjectResult).Value) as OASystem.Domain.ViewModels.JsonView);
                 if (QueryUserListApiResult != null)
                 {
                     if (QueryUserListApiResult.Code == 200)
                     {
-                        users = QueryUserListApiResult.Data as List<UserInfo>;
+                        users = QueryUserListApiResult.Data as List<UserInfoWebView>;
                     }
                 }
 

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -42,7 +42,7 @@ namespace OASystem.Domain.AutoMappers
             #region 用户板块
             CreateMap<UserDto, Sys_Users>();
             CreateMap<Sys_Users, UserInfo>();
-
+            CreateMap<UserInfo,UserInfoWebView>();
 
             #endregion
 

OASystem/OASystem.Domain/ViewModels/CompanyView.cs

@@ -50,6 +50,7 @@ namespace OASystem.Domain.ViewModels
         /// 备注
         /// </summary>
         public string Remark { get; set; }
+
     }
 
 }

OASystem/OASystem.Domain/ViewModels/System/DepartmentView.cs

@@ -14,10 +14,19 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         public int Id { get; set; }
 
+        /// <summary>
+        /// 部门code
+        /// </summary>
+        public string DepCode { get; set; }
+
         /// <summary>
         /// 公司Id
         /// </summary>
         public int CompanyId { get; set; }
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
 
         /// <summary>
         /// 部门名称
@@ -28,5 +37,14 @@ namespace OASystem.Domain.ViewModels.System
         /// 父级部门Id
         /// </summary>
         public int ParentDepId { get; set; }
+        /// <summary>
+        /// 父级部门Name
+        /// </summary>
+        public string ParentDepName { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }

OASystem/OASystem.Domain/ViewModels/System/UserInfoView.cs

@@ -14,6 +14,10 @@ namespace OASystem.Domain.ViewModels.System
     /// </summary>
     public class UserInfoWebView
     {
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+        public int Id { get; set; }
         /// <summary>
         /// 公司Id
         /// </summary>
@@ -43,10 +47,6 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         public string JobName { get; set; }
         /// <summary>
-        /// 用户Id
-        /// </summary>
-        public int UserId { get; set; }
-        /// <summary>
         /// 中文姓名
         /// </summary>
 
@@ -78,6 +78,14 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
 
         public string Email { get; set; }
+        /// <summary>
+        /// 试用期
+        /// </summary>
+        public string UsePeriod { get; set; }
+        /// <summary>
+        /// 人事审核 0未审核(初始状态) 1 已通过（可用）2已拒绝
+        /// </summary>
+        public int HrAudit { get; set; }
     }
 
 

OASystem/OASystem.Infrastructure/Repositories/System/UsersRepository.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
-    public class UsersRepository : BaseRepository<UserInfo, JsonView>
+    public class UsersRepository : BaseRepository<UserInfo, UserInfoWebView>
     {
         public UsersRepository(SqlSugarClient sqlSugar) : base(sqlSugar){}