修改 员工登陆时 返回数据字段

查询员工列表 返回View

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -7,7 +7,7 @@ namespace OASystem.API.Controllers
     /// <summary>
     /// 系统设置
     /// </summary>
-    //[Authorize]
+    [Authorize]
     [Route("api/[controller]/[action]")]
     public class SystemController : ControllerBase
     {

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

@@ -12,15 +12,24 @@ namespace OASystem.Domain.ViewModels.System
     /// 用户数据 数据库返回数据实体接受类
     /// 查询返回View
     /// </summary>
-    public class UserView
+    public class UserInfoWebView
     {
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
 
         /// <summary>
         /// 部门Id
         /// </summary>
 
         public int DepId { get; set; }
-       
+
         /// <summary>
         /// 部门名称
         /// </summary>
@@ -36,46 +45,47 @@ namespace OASystem.Domain.ViewModels.System
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int Id { get; set; }
+        public int UserId { get; set; }
         /// <summary>
         /// 中文姓名
         /// </summary>
-        
+
         public string CnName { get; set; }
-       
+
         /// <summary>
         /// 工号
         /// </summary>
-        
+
         public string Number { get; set; }
+
+        /// <summary>
+        /// 分机号
+        /// </summary>
+        public string Ext { get; set; }
+
         /// <summary>
         /// 手机号
         /// </summary>
-        
+
         public string Phone { get; set; }
         /// <summary>
         /// 紧急联系人 手机号
         /// </summary>
-        
+
         public string UrgentPhone { get; set; }
         /// <summary>
         /// 邮箱
         /// </summary>
-        
+
         public string Email { get; set; }
     }
 
+
     /// <summary>
-    /// 用户数据 - Web
+    /// 用户信息 - 个人基本信息 登陆时返回信息
-    /// 查询返回View
     /// </summary>
-    public class UserInfoWebView
+    public class UserLoginInfoView
     {
-        ///// <summary>
-        ///// 工号
-        ///// </summary>
-        ////public string Number { get; set; }
-
         /// <summary>
         /// 用户Id
         /// </summary>
@@ -100,14 +110,14 @@ namespace OASystem.Domain.ViewModels.System
         /// 岗位名称
         /// </summary>
         public string JobName { get; set; }
-       
+
         /// <summary>
         /// 邮箱
         /// </summary>
         public string Email { get; set; }
-
     }
 
+
     /// <summary>
     /// 用户信息 - 个人基本信息
     /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Login/LoginRepository.cs

@@ -60,7 +60,7 @@ namespace OASystem.Infrastructure.Repositories.Login
                                                   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 _userBasicInfo = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).FirstAsync();
+            var _userBasicInfo = await _sqlSugar.SqlQueryable<UserLoginInfoView>(userSqlWhere).FirstAsync();
 
 
 

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

@@ -56,24 +56,24 @@ namespace OASystem.Infrastructure.Repositories.System
             if (portType == 1) //web
             {
 
-                //string userSqlWhere = string.Format(@"Select su.CompanyId, sc.CompanyName,su.DepId,sd.DepName,su.JobPostId,
+                string userSqlWhere = string.Format(@"Select su.CompanyId, sc.CompanyName,su.DepId,sd.DepName,su.JobPostId,sjp.JobName,
-                //                                  	     sjp.JobName,su.Id UserId,su.CnName,su.Phone,su.UrgentPhone,su.Email
+                                                        su.Id UserId,su.CnName,su.CnName,su.Number,su.Ext,su.Phone,su.UrgentPhone,su.Email
-                //                                      From Sys_Users su 
+                                                      From Sys_Users su 
-                //                                      Inner Join Sys_Company sc On su.CompanyId = sc.Id
+                                                      Inner Join Sys_Company sc On su.CompanyId = sc.Id
-                //                                      Inner Join Sys_Department sd On su.DepId = sd.Id
+                                                      Inner Join Sys_Department sd On su.DepId = sd.Id
-                //                                      Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id {0}", sqlWhere);
+                                                      Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id {0}", sqlWhere);
-                //var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
+                var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
 
-                //if (_userList.Count != 0)
+                if (_userList.Count != 0)
-                //{
+                {
-                //    result.Code = 0;
+                    result.Code = 0;
-                //    result.Msg = "成功!";
+                    result.Msg = "成功!";
-                //    result.Data = _userList;
+                    result.Data = _userList;
-                //}
+                }
-                //else
+                else
-                //{
+                {
-                //    result.Msg = "暂无数据!";
+                    result.Msg = "暂无数据!";
-                //}
+                }
             }
             else if (portType == 2) //Android
             {