新增Dto基类 存放portType端口字段 1 Web 2 Android 3 IOS

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -31,14 +31,13 @@ namespace OASystem.API.Controllers
 
         #region user 操作
 
-       
-        [HttpGet]
+        [HttpPost]
         [ProducesResponseType(typeof(LoginView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetUserList()
+        public async Task<IActionResult> GetUserList(DtoBase dto)
         {
             try
             {
-                var result = _userRep.GetUserList("");
+                var result = _userRep.GetUserList(dto.PortType,string.Empty);
                 if (result.Result.Code != 0)
                 {
                     return Ok(JsonView(false, "暂无数据！"));
@@ -127,7 +126,7 @@ namespace OASystem.API.Controllers
                     Regex r = new Regex("And");
                     sqlWhere = r.Replace(sqlWhere, "Where", 1);
                 }
-                var result=_userRep.GetUserList(sqlWhere);
+                var result=_userRep.GetUserList(dto.PortType,sqlWhere);
                 if (result.Result.Code!=0)
                 {
                     return Ok(JsonView(false, "暂无数据！"));

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -29,6 +29,7 @@ namespace OASystem.Domain.AutoMappers
             CreateMap<UserDto, Sys_Users>();
             CreateMap<Sys_Users, UserInfoView>();
             CreateMap<UserInfoView,UserIView>();
+            CreateMap<UserInfoView, UserIWebView>();
             #endregion
 
         }

OASystem/OASystem.Domain/Dtos/DtoBase.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Dtos
+{
+    /// <summary>
+    /// 请求实体类 基类
+    /// </summary>
+    public class DtoBase
+    {
+        /// <summary>
+        /// 请求端口分类
+        /// 1 Web 2 Android 3 IOS
+        /// </summary>
+        public int PortType { get; set; }
+    }
+}

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

@@ -9,7 +9,7 @@ namespace OASystem.Domain.Dtos.System
     /// <summary>
     /// 员工表查询dto
     /// </summary>
-    public class UserDto
+    public class UserDto : DtoBase
     {
         /// <summary>
         /// 公司Id

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

@@ -9,7 +9,8 @@ namespace OASystem.Domain.ViewModels.System
 {
     
     /// <summary>
-    /// 用户数据查询返回View
+    /// 用户数据 数据库返回数据实体接受类
+    /// 查询返回View
     /// </summary>
     public class UserIView
     {
@@ -116,4 +117,77 @@ namespace OASystem.Domain.ViewModels.System
         public string HomeAddress { get; set; }
         
     }
+
+    /// <summary>
+    /// 用户数据 - Web
+    /// 查询返回View
+    /// </summary>
+    public class UserIWebView
+    {
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string Number { get; set; }
+
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 中文姓名
+        /// </summary>
+        public string CnName { get; set; }
+
+        /// <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>
+        public string DepName { get; set; }
+
+        /// <summary>
+        /// 岗位Id
+        /// </summary>
+        public int JobPostId { get; set; }
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string JobName { 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; }
+
+    }
 }

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

@@ -1,7 +1,8 @@
 using AutoMapper;
 using OASystem.Domain;
-
+using OASystem.Domain.Entities.System;
 using OASystem.Domain.ViewModels.System;
+using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,9 +14,9 @@ namespace OASystem.Infrastructure.Repositories.System
     public class UsersRepository : BaseRepository<UserInfoView, JsonView>
     {
         private readonly IMapper _mapper;
-        public UsersRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
+        public UsersRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
         {
-
+            _mapper = mapper;
         }
 
         /// <summary>
@@ -23,7 +24,7 @@ namespace OASystem.Infrastructure.Repositories.System
         /// </summary>
         /// <param name="_userRep"></param>
         /// <returns></returns>
-        public async Task<Result> GetUserList(string sqlWhere)
+        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 
@@ -31,22 +32,48 @@ namespace OASystem.Infrastructure.Repositories.System
                                                   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);
-            List<UserIView> _userDataList = _mapper.Map<List<UserIView>>(_userList);
-            if (_userDataList.Count != 0) 
+
+            if (portType == 1) //web
+            {
+                List<UserIWebView> _userWebList = _mapper.Map<List<UserIWebView>>(_userList);
+
+                if (_userList.Count != 0)
+                {
+                    result.Code = 0;
+                    result.Msg = "成功!";
+                    result.Data = _userWebList;
+                }
+                else
+                {
+                    result.Code = -1;
+                    result.Msg = "暂无数据!";
+                }
+            }
+            else if (portType == 2) //Android
+            {
+                List<UserIView> _userDataList = _mapper.Map<List<UserIView>>(_userList);
+                if (_userDataList.Count != 0)
+                {
+                    result.Code = 0;
+                    result.Msg = "成功!";
+                    result.Data = _userDataList;
+                }
+                else
+                {
+                    result.Code = -1;
+                    result.Msg = "暂无数据!";
+                }
+            }
+            else if (portType == 3) //IOS
             {
-                result.Code = 0;
-                result.Msg = "成功!";
-                result.Data = _userDataList;
             }
             else
             {
                 result.Code = -1;
                 result.Msg = "暂无数据!";
-                result.Data = _userDataList;
-            }
+            } 
             
             return result;
-
         }
     }
 }