解决冲突

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

@@ -12,8 +12,17 @@ namespace OASystem.Domain.ViewModels.System
     /// 用户数据 数据库返回数据实体接受类
     /// 查询返回View
     /// </summary>
-    public class UserIView
+    public class UserInfoWebView
     {
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
 
         /// <summary>
         /// 部门Id
@@ -48,6 +57,12 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         
         public string Number { get; set; }
+
+        /// <summary>
+        /// 分机号
+        /// </summary>
+        public string Ext { get; set; }
+
         /// <summary>
         /// 手机号
         /// </summary>
@@ -69,8 +84,13 @@ namespace OASystem.Domain.ViewModels.System
     /// 用户数据 - Web
     /// 查询返回View
     /// </summary>
-    public class UserIWebView
+    public class UserLoginInfoView
     {
+        ///// <summary>
+        ///// 工号
+        ///// </summary>
+        ////public string Number { get; set; }
+
         /// <summary>
         /// 工号
         /// </summary>
@@ -99,17 +119,20 @@ namespace OASystem.Domain.ViewModels.System
         /// <summary>
         /// 部门Id
         /// </summary>
-        public int DepId { get; set; }
+        public string JobName { get; set; }
 
         /// <summary>
         /// 部门名称
         /// </summary>
-        public string DepName { get; set; }
+        public string Email { get; set; }
+    }
 
-        /// <summary>
-        /// 岗位Id
-        /// </summary>
-        public int JobPostId { get; set; }
+
+    /// <summary>
+    /// 用户信息 - 个人基本信息
+    /// </summary>
+    public class UserBasicInfoView 
+    {
         /// <summary>
         /// 岗位名称
         /// </summary>

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

@@ -31,6 +31,26 @@ namespace OASystem.Infrastructure.Repositories.Login
 
                 return result;
             }
+
+            //该用户是否已删除
+            if (_entity.HrAudit != 1)
+            {
+                result.Msg = "已离职员工没有登录权限!";
+                return result;
+            }
+
+
+            //员工数据
+            string sqlWhere = string.Format(" Where su.Id={0}", _entity.Id);
+            string userSqlWhere = string.Format(@"Select sc.CompanyName,sd.DepName,sjp.JobName,su.Id UserId,su.CnName,su.Email
+                                                  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 _userBasicInfo = await _sqlSugar.SqlQueryable<UserLoginInfoView>(userSqlWhere).FirstAsync();
+
+
+
             result.Code = 0;
             result.Msg = "登录成功!";
             result.Data = _entity;

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

@@ -26,25 +26,52 @@ namespace OASystem.Infrastructure.Repositories.System
         /// <returns></returns>
         public async Task<Result> GetUserList(int portType,string sqlWhere)
         {
-            Result result = new Result();
-            string userSqlWhere = string.Format(@"Select sjp.JobName,sd.DepName,sc.CompanyName,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 = await GetListBySqlWithNolockAsync(userSqlWhere);
+            Result result = new Result() { Code = -2 };
+            
+            //List<UserInfoWebView> _userList = _sqlSugar.Queryable<Sys_Users>()
+            //    .InnerJoin<Sys_Company>((u, c) => u.CompanyId == c.Id) //若是多个条件 用 &&
+            //    .InnerJoin<Sys_Department>((u, c, d) => u.DepId == d.Id)
+            //    .InnerJoin<Sys_JobPost>((u, c, d, j) => u.JobPostId == j.Id)
+            //    .Where((u) => u.Id == 208)
+            //    .Select
+            //    ((u, c, d, j) => new UserInfoWebView
+            //    { 
+            //        Number = u.Number,
+            //        CompanyId = u.CompanyId, 
+            //        CompanyName = c.CompanyName, 
+            //        DepId=u.DepId,
+            //        DepName = d.DepName,
+            //        JobPostId = u.JobPostId,
+            //        JobName = j.JobName,
+            //        Id = u.Id,
+            //        CnName = u.CnName,
+            //        Phone = u.Phone,
+            //        UrgentPhone = u.UrgentPhone,
+            //        Ext =u.Ext,
+            //        Email = u.Email,
+            //    })
+            //    .ToList();
+
 
             if (portType == 1) //web
             {
-                List<UserIWebView> _userWebList = _mapper.Map<List<UserIWebView>>(_userList);
+
+                string userSqlWhere = string.Format(@"Select su.CompanyId, sc.CompanyName,su.DepId,sd.DepName,su.JobPostId,sjp.JobName,
+                                                        su.Id UserId,su.CnName,su.CnName,su.Number,su.Ext,su.Phone,su.UrgentPhone,su.Email
+                                                      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 = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
+
                 if (_userList.Count != 0)
                 {
                     result.Code = 0;
                     result.Msg = "成功!";
-                    result.Data = _userWebList;
+                    result.Data = _userList;
                 }
                 else
                 {
-                    result.Code = -1;
                     result.Msg = "暂无数据!";
                 }
             }