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

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -5,9 +5,8 @@ using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using StackExchange.Redis;
 using OASystem.Domain.Dtos.UserDto;
-using OASystem.Domain.Entities.System;
-using OASystem.Domain;
 using OASystem.RedisRepository;
+using OASystem.Infrastructure.Repositories.System;
 
 namespace OASystem.API.Controllers
 {
@@ -20,11 +19,17 @@ namespace OASystem.API.Controllers
         private readonly IMapper _mapper;
         private readonly IConfiguration _config;
         private readonly LoginRepository _loginRep;
+        private readonly UsersRepository _usersRepository;
+      
+        //private IDatabase _redis; 
+        //private RedisHelper _redisHelper;
         public AuthController(IConfiguration config, LoginRepository loginRep, IMapper mapper)
         {
             _config = config;
             _loginRep = loginRep;
             _mapper = mapper;
+           
+            //_usersRepository = usersRepository;
         }
 
         /// <summary>
@@ -32,14 +37,13 @@ namespace OASystem.API.Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [AllowAnonymous]
         [Route("login")]
         [HttpPost]
         [ProducesResponseType(typeof(LoginView), StatusCodes.Status200OK)]
         public async Task<IActionResult> LoginAsync(LoginDto dto)
         {
-            #region 校验用户信息，假设此处我们已经校验成功
-            var userData = _loginRep.Login(_loginRep, dto);
+            #region 校验用户信息 
+            var userData = _loginRep.Login(dto);
             if (userData.Result.Code != 0)
             {
                 if (userData.Result.Code != 0) { return Ok(JsonView(false, userData.Result.Msg)); }
@@ -47,23 +51,11 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "暂无该员工信息!"));
             }
 
-            //人事审核是否通过
-            if (userData.Result.Data.HrAudit != 1)
-            {
-                return Ok(JsonView(false, "该员工账号暂无登录权限,人事审核未通过!"));
-            }
-
-            //该用户是否已删除
-            if (userData.Result.Data.HrAudit != 1)
-            {
-                return Ok(JsonView(false, "已离职员工没有登录权限"));
-            }
-
-
             #endregion
             var view = new LoginView
             {
-                Expires = DateTime.Now.AddMinutes(30)
+                Expires = DateTime.Now.AddMinutes(30),
+                UserInfo = userData.Result.Data
             };
 
             string authorId = dto.Number + "Token";
@@ -158,5 +150,10 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(view));
         }
+
+       
+
+
+
     }
 }

OASystem/OASystem.Api/Controllers/BaseController.cs

@@ -49,6 +49,17 @@ public class ControllerBase : Microsoft.AspNetCore.Mvc.ControllerBase
             return new JsonView { Code = StatusCodes.Status400BadRequest, Msg = msg };
         }
     }
+    protected virtual JsonView JsonView(bool s, string msg, object obj)
+    {
+        if (s)
+        {
+            return new JsonView { Code = StatusCodes.Status200OK, Msg = msg,Data= obj };
+        }
+        else
+        {
+            return new JsonView { Code = StatusCodes.Status400BadRequest, Msg = msg };
+        }
+    }
     protected virtual JsonView JsonView(int code, string msg, object obj)
     {
         return new JsonView { Code = code, Msg = msg, Data = obj };

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1,6 +1,8 @@
 
 
+using OASystem.Infrastructure.Repositories.System;
 
+using System.ComponentModel.Design;
 
 namespace OASystem.API.Controllers
 {
@@ -17,44 +19,25 @@ namespace OASystem.API.Controllers
         private readonly UsersRepository _userRep;
         private readonly IMapper _mapper;
 
+        private readonly SetDataRepository _setDataRepository;
+        private readonly SystemMenuPermissionRepository _SystemMenuPermissionRepository;
+        private readonly CompanyRepository _CompanyRepository;
+        private readonly JobPostRepository _jobRep;
+
         public SystemController( CompanyRepository syscom,DepartmentRepository sysDepRep, UsersRepository userRep,
-            IMapper mapper)
+            IMapper mapper, SetDataRepository setDataRepository, CompanyRepository companyRepository,
+            SystemMenuPermissionRepository systemMenuPermissionRepository, JobPostRepository jobRep)
         {
             _syscomRep = syscom;
             _sysDepRep = sysDepRep;
             _userRep = userRep;
             _mapper = mapper;
+            _setDataRepository = setDataRepository;
+            _CompanyRepository = companyRepository;
+            _SystemMenuPermissionRepository = systemMenuPermissionRepository;
+            _jobRep = jobRep;
         }
 
-        #region user 操作
-        /// <summary>
-        /// 查询所有员工（web）
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetUserList(DtoBase dto)
-        {
-            try
-            {
-                var result = _userRep.GetUserList(dto.PortType,string.Empty);
-                if (result.Result.Code != 0)
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
-
-                }
-                return Ok(JsonView(result.Result.Data));
-            }
-            catch (Exception)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
-            }
-        }
-
-        #endregion
-
         #region 企业操作
         /// <summary>
         /// 查询企业数据
@@ -69,16 +52,23 @@ namespace OASystem.API.Controllers
             {
                 if (dto.PortType == 1)
                 {
-                    return Ok(JsonView(false, "暂无数据！"));
+                    var CompanyDataResult = _CompanyRepository.GetCompanyData();
+                    if (CompanyDataResult.Code != 0)
+                    {
+                        return Ok(JsonView(CompanyDataResult.Msg));
+                    }
+
+                    return Ok(JsonView(true, "查询成功！", CompanyDataResult.Data));
                 }
                 else if (dto.PortType == 2)
                 {
-                    var companyList = _sysDepRep.QueryDto<Sys_Company, CompanyView>(a=>a.ToBool(true)).ToList();
-                    if (companyList.Count == 0)
+                    var CompanyDataResult = _CompanyRepository.GetCompanyData();
+                    if (CompanyDataResult.Code != 0)
                     {
-                        return Ok(JsonView(false, "暂无数据！"));
+                        return Ok(JsonView(CompanyDataResult.Msg));
                     }
-                    return Ok(JsonView(companyList));
+                    
+                    return Ok(JsonView(true,"查询成功！", CompanyDataResult.Data));
                 }
                 else if (dto.PortType == 3)
                 {
@@ -105,25 +95,34 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView),StatusCodes.Status200OK)]
         public async Task<IActionResult> AddCompany(AddCompanyDto dto)
         {
-            if (string.IsNullOrWhiteSpace(dto.CompanyName) || dto.CreateUserId==0 || !string.IsNullOrWhiteSpace(dto.CompanyCode))
-            {
-                return Ok(JsonView(-1, "请检查信息是否输入完整！", null));
-            }
-            else if (string.IsNullOrWhiteSpace(dto.Tel))
-            {
-                return Ok(JsonView(-1, "请检查联系方式是否输入正确！", null));
-            }
-            else
+            try
             {
-                Sys_Company _Company = _mapper.Map<Sys_Company>(dto);
-                int id = await _syscomRep.AddAsyncReturnId(_Company);
-                if (id == 0)
+                if (string.IsNullOrWhiteSpace(dto.CompanyName) || dto.CreateUserId == 0 || string.IsNullOrWhiteSpace(dto.CompanyCode))
+                {
+                    return Ok(JsonView(false, "请检查信息是否输入完整！"));
+                }
+                else if (string.IsNullOrWhiteSpace(dto.Tel))
+                {
+                    return Ok(JsonView(false, "请检查联系方式是否输入正确！"));
+                }
+                else
                 {
-                    return Ok(JsonView(-1, "添加失败！", null));
+                    Sys_Company _Company = _mapper.Map<Sys_Company>(dto);
+                    int id = await _syscomRep.AddAsyncReturnId(_Company);
+                    if (id == 0)
+                    {
+                        return Ok(JsonView(false, "添加失败！"));
 
+                    }
+                    return Ok(JsonView(true,"添加成功", new { Id = id }));
                 }
-                return Ok(JsonView(0, "成功", id));
             }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+            
             
         }
 
@@ -140,11 +139,11 @@ namespace OASystem.API.Controllers
             {
                 if (string.IsNullOrWhiteSpace(dto.CompanyName) || string.IsNullOrWhiteSpace(dto.CompanyCode) || string.IsNullOrWhiteSpace(dto.Address) || dto.ParentCompanyId == 0 || dto.ContactUserId == 0)
                 {
-                    return Ok(JsonView(-1, "请检查信息是否输入完整！", null));
+                    return Ok(JsonView(false, "请检查信息是否输入完整！"));
                 }
                 else if (string.IsNullOrWhiteSpace(dto.Tel))
                 {
-                    return Ok(JsonView(-1, "请检查联系方式是否输入正确！", null));
+                    return Ok(JsonView(false, "请检查联系方式是否输入正确！"));
                 }
                 else
                 {
@@ -157,8 +156,8 @@ namespace OASystem.API.Controllers
                         Tel = dto.Tel,
                         ContactUserId = dto.ContactUserId,
                     });
-                    if (!res) { return Ok(JsonView(-1, "失败", null)); }
-                    return Ok(JsonView(0, "成功", null));
+                    if (!res) { return Ok(JsonView(false, "修改失败")); }
+                    return Ok(JsonView(true,"修改成功！"));
                 }
             }
             catch (Exception)
@@ -182,8 +181,8 @@ namespace OASystem.API.Controllers
             try
             {
                 bool res = await _syscomRep.SoftDeleteAsync<Sys_Company>(dto.Id.ToString());
-                if (!res) { return Ok(JsonView(-1, "失败", null)); }
-                return Ok(JsonView(0, "成功", null));
+                if (!res) { return Ok(JsonView(false, "删除失败")); }
+                return Ok(JsonView(true, "删除成功"));
             }
             catch (Exception)
             {
@@ -203,7 +202,7 @@ namespace OASystem.API.Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        //[Authorize]
+        
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryDepartmentList(DepartmentDto dto)
@@ -221,7 +220,7 @@ namespace OASystem.API.Controllers
                     {
                         return Ok(JsonView(false, "暂无数据！"));
                     }
-                    return Ok(JsonView(result));
+                    return Ok(JsonView(true,"查询成功！",result));
                 }
                 else if (dto.PortType == 3)
                 {
@@ -239,9 +238,259 @@ namespace OASystem.API.Controllers
             }
          
         }
+        /// <summary>
+        /// 部门添加
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> AddDepartment(AddDepartmentDto dto)
+        {
+            try
+            {
+                if (dto.CreateUserId == 0 || string.IsNullOrWhiteSpace(dto.DepName) || dto.CompanyId == 0 || string.IsNullOrWhiteSpace(dto.DepCode))
+                {
+                    return Ok(JsonView(false, "请检查信息是否输入完整！"));
+                }
+                else
+                {
+                    Sys_Department _Department = _mapper.Map<Sys_Department>(dto);
+                    int id = await _sysDepRep.AddAsyncReturnId(_Department);
+                    if (id == 0)
+                    {
+                        return Ok(JsonView(false, "添加失败！"));
+                    }
+                    return Ok(JsonView(true, "添加成功！", new { Id = id }));
+                }
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+            
+           
+        }
+
+        /// <summary>
+        /// 部门修改
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> EditDepartment(EditDepartmentDto dto)
+        {
+            try
+            {
+                if (dto.Id==0 || string.IsNullOrWhiteSpace(dto.DepName) || dto.CompanyId == 0 || string.IsNullOrWhiteSpace(dto.DepCode))
+                {
+                    return Ok(JsonView(false, "请检查信息是否输入完整！"));
+                }
+                else
+                {
+                    bool res = await _sysDepRep.UpdateAsync<Sys_Department>(a => a.Id == dto.Id, a => new Sys_Department
+                    {
+                        CompanyId=dto.CompanyId,
+                        DepCode=dto.DepCode,
+                        DepName=dto.DepName,
+                        ParentDepId=dto.ParentDepId,
+                        Remark=dto.Remark,
+                     });
+                    if (!res)
+                    {
+                        return Ok(JsonView(false, "修改失败！"));
+                    }
+                    return Ok(JsonView(true, "修改成功！"));
+                }
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+
+
+        }
+
+        /// <summary>
+        /// 部门删除
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DelDepartment(DelDepartmentDto dto)
+        {
+            try
+            {
+                if (dto.Id == 0)
+                {
+                    return Ok(JsonView(-1, "请检查信息是否输入完整！", null));
+                }
+                else
+                {
+                    bool res =await _sysDepRep.SoftDeleteAsync<Sys_Department>(dto.Id.ToString());
+                    if (!res)
+                    {
+                        return Ok(JsonView(false, "删除失败！"));
+                    }
+                    return Ok(JsonView(true, "删除成功！"));
+                }
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+
+
+        }
+        #endregion
+
+        #region 岗位板块
+        /// <summary>
+        /// 岗位查询
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> QueryJobPost(QueryJobPostDto dto)
+        {
+            try
+            {
+                if (dto.PortType == 1)
+                {
+                    return Ok(JsonView(false, "暂无数据！"));
+                }
+                else if (dto.PortType == 2)
+                {
+                    var result = _jobRep.QueryDto<Sys_JobPost, JobPostView>(s => s.CompanyId == dto.CompanyId && s.DepId==dto.DepId).ToList();
+                    if (result.Count == 0)
+                    {
+                        return Ok(JsonView(false, "暂无数据！"));
+                    }
+                    return Ok(JsonView(true, "查询成功！", result));
+                }
+                else if (dto.PortType == 3)
+                {
+                    return Ok(JsonView(false, "暂无数据！"));
+                }
+                else
+                {
+                    return Ok(JsonView(false, "暂无数据！"));
+                }
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        /// <summary>
+        /// 添加岗位
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> AddJobPost(AddJobPostDto dto)
+        {
+            try
+            {
+                Sys_JobPost sys_Job = _mapper.Map<Sys_JobPost>(dto);
+                int id = await _jobRep.AddAsyncReturnId(sys_Job);
+                if (id == 0)
+                {
+                    return Ok(JsonView(false, "添加失败"));
+                }
+                return Ok(JsonView(true, "添加成功", new { Id = id }));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        /// <summary>
+        /// 修改岗位
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> EditJobPost(EditJobPostDto dto)
+        {
+            try
+            {
+                bool res = await _jobRep.UpdateAsync<Sys_JobPost>(a=>a.Id==dto.Id,a =>new Sys_JobPost
+                {
+                    CompanyId=dto.CompanyId,
+                    DepId=dto.DepId,
+                    JobName=dto.JobName,
+                    Remark=dto.Remark,
+                });
+                if (!res)
+                {
+                    return Ok(JsonView(false, "修改失败"));
+                }
+                return Ok(JsonView(true, "修改成功"));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+
+        public async Task<IActionResult> DelJobPost(DelJobPostDto dto)
+        {
+            try
+            {
+                bool res = await _jobRep.SoftDeleteAsync<Sys_JobPost>(dto.Id.ToString());
+                if (!res)
+                {
+                    return Ok(JsonView(false, "删除失败！"));
+                }
+                return Ok(JsonView(true, "删除成功"));
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
         #endregion
 
         #region 用户操作
+        /// <summary>
+        /// 查询所有员工（web）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetUserList(DtoBase dto)
+        {
+            try
+            {
+                var result = _userRep.GetUserList(dto.PortType, string.Empty);
+                if (result.Result.Code != 0)
+                {
+                    return Ok(JsonView(false, "暂无数据！"));
+
+                }
+                return Ok(JsonView(true, "查询成功！", result.Result.Data));
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+
         /// <summary>
         /// 查询用户数据
         /// </summary>
@@ -273,7 +522,7 @@ namespace OASystem.API.Controllers
                     return Ok(JsonView(false, "暂无数据！"));
 
                 }
-                return Ok(JsonView(result.Result.Data));
+                return Ok(JsonView(true,"查询成功！",result.Result.Data));
             }
             catch (Exception)
             {
@@ -282,7 +531,68 @@ namespace OASystem.API.Controllers
             }
            
         }
+
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> AddUser(AddUserDto dto)
+        {
+            int id = 0;
+            return Ok(JsonView(true, "添加成功！", new { Id = id }));
+        }
         #endregion
 
+        #region 权限模块
+        /// <summary>
+        /// 权限数据页面初始化
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        //[Authorize]
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetAuth(AuthDto dto)
+        {
+            Result result = new Result();
+            //模块数据
+            var setDataResult = await _setDataRepository.GetSySDefultModule(_setDataRepository);
+            if (setDataResult.Code != 0)
+            {
+                return Ok(JsonView(setDataResult.Msg));
+            }
+
+            List<SetDataView> setDataList = _mapper.Map<List<SetDataView>>(setDataResult.Data);
+            var mod = setDataList.Find(x => x.Name == "权限模块");
+            if (mod == null)
+            {
+                return Ok(JsonView("未找到权限模块！"));
+            }
+
+            //页面数据
+            var SystemMenuPermissionData = _SystemMenuPermissionRepository.GetSystemMenuViweData(_SystemMenuPermissionRepository, mod.Id, dto.pageSize, dto.currentPage);
+            if (SystemMenuPermissionData.Code != 0)
+            {
+                return Ok(JsonView(SystemMenuPermissionData.Msg));
+            }
+
+            //公司数据
+            var CompanyDataResult = _CompanyRepository.GetCompanyData();
+            if (CompanyDataResult.Code != 0)
+            {
+                return Ok(JsonView(CompanyDataResult.Msg));
+            }
+
+            result.Code = 0;
+            result.Msg = "成功！";
+            var Dyresult = new
+            {
+                setDataResult = setDataResult.Data,
+                CompanyDataResult = CompanyDataResult.Data,
+                SystemMenuPermissionData = SystemMenuPermissionData.Data
+            };
+
+            return Ok(JsonView(200, "成功！", Dyresult));
+        }
+
+        #endregion
     }
 }

OASystem/OASystem.Api/OASystemAuthentication.cs

@@ -0,0 +1,6 @@
+namespace OASystem.API
+{
+    public class OASystemAuthentication
+    {
+    }
+}

OASystem/OASystem.Api/Program.cs

@@ -173,8 +173,23 @@ builder.Services.AddScoped<IMapper, Mapper>();
 
 #endregion
 
+#region ¿çÓòÅäÖÃ
+builder.Services.AddCors(c =>
+{
+    c.AddPolicy("AllowAllOrigins", policy =>
+    {
+        policy.AllowAnyOrigin()
+        .AllowAnyMethod()
+        .AllowAnyHeader();
+    });
+});
+#endregion
+
+
 var app = builder.Build();
 
+app.UseCors("AllowAllOrigins");
+
 // Configure the HTTP request pipeline.
 if (!app.Environment.IsDevelopment())
 {

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -24,13 +24,20 @@ namespace OASystem.Domain.AutoMappers
 
             #region 部门板块
             CreateMap<Sys_Department, DepartmentIView>();
+            CreateMap<AddDepartmentDto,Sys_Department>();
+            CreateMap<EditDepartmentDto,Sys_Department>();
+            #endregion
+
+            #region 岗位板块
+            CreateMap<Sys_JobPost, JobPostView>();
+            CreateMap<AddJobPostDto,Sys_JobPost>();
             #endregion
 
             #region 用户板块
             CreateMap<UserDto, Sys_Users>();
-            CreateMap<Sys_Users, UserInfoView>();
-            CreateMap<UserInfoView,UserIView>();
-            CreateMap<UserInfoView, UserIWebView>();
+            CreateMap<Sys_Users, UserInfo>();
+
+
             #endregion
 
         }

OASystem/OASystem.Domain/Dtos/System/AuthDto.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.System
+{
+    public class AuthDto
+    {
+        /// <summary>
+        /// 显示的行数
+        /// </summary>
+        public int pageSize { get; set; }
+        /// <summary>
+        /// 当前页
+        /// </summary>
+        public int currentPage { get; set; }
+    }
+}

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

@@ -125,6 +125,9 @@ namespace OASystem.Domain.Dtos.System
     /// </summary>
     public class DelCompanyDto
     {
+        /// <summary>
+        /// 公司Id
+        /// </summary>
         public int Id { get; set; }
     }
 }

OASystem/OASystem.Domain/Dtos/System/DepartmentDto.cs

@@ -1,4 +1,5 @@
-using System;
+using OASystem.Domain.Entities;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -7,6 +8,9 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.Dtos.System
 {
+    /// <summary>
+    /// 查询dto
+    /// </summary>
     public class DepartmentDto:DtoBase
     {
         /// <summary>
@@ -14,4 +18,74 @@ namespace OASystem.Domain.Dtos.System
         /// </summary>
         public int CompanyId { get; set; }
     }
+    /// <summary>
+    /// 添加dto
+    /// </summary>
+    public class AddDepartmentDto
+    {
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+        /// <summary>
+        /// 部门code
+        /// </summary>
+        public string DepCode { get; set; }
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DepName { get; set; }
+        /// <summary>
+        /// 父级部门Id
+        /// </summary>
+        public int ParentDepId { get; set; }
+
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string Remark { get; set; }
+       
+    }
+
+    /// <summary>
+    /// 修改dto
+    /// </summary>
+    public class EditDepartmentDto
+    {
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+        /// <summary>
+        /// 部门code
+        /// </summary>
+        public string DepCode { get; set; }
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DepName { get; set; }
+        /// <summary>
+        /// 父级部门Id
+        /// </summary>
+        public int ParentDepId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+    }
+
+    public class DelDepartmentDto
+    {
+        public int Id { get; set; }
+    }
 }

OASystem/OASystem.Domain/Dtos/System/JobPostDto.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Dtos.System
+{
+    /// <summary>
+    /// 查询岗位
+    /// </summary>
+    public class QueryJobPostDto : DtoBase
+    {
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+
+        public int CompanyId { get; set; }
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        public int DepId { get; set; }
+    }
+    /// <summary>
+    /// 添加岗位dto
+    /// </summary>
+    public class AddJobPostDto
+    {
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        public int DepId { get; set; }
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string JobName { get; set; }
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+       
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+       
+    }
+    /// <summary>
+    /// 修改岗位dto
+    /// </summary>
+    public class EditJobPostDto
+    {
+        /// <summary>
+        /// 岗位Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        public int DepId { get; set; }
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string JobName { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+    }
+
+    public class DelJobPostDto
+    {
+        /// <summary>
+        /// 职位Id
+        /// </summary>
+        public int Id { get; set; }
+    }
+}

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

@@ -20,4 +20,11 @@ namespace OASystem.Domain.Dtos.System
         /// </summary>
         public int DepId { get;set; }
     }
+    /// <summary>
+    /// 员工添加dto
+    /// </summary>
+    public class AddUserDto
+    {
+
+    }
 }

OASystem/OASystem.Domain/Entities/Resource/Res_CarData.cs

@@ -33,7 +33,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 联系人
         /// </summary>
-        [SugarColumn(IsNullable = true,ColumnDataType = "varchar(30)")]
+        [SugarColumn(IsNullable = true,ColumnDataType = "varchar(50)")]
         public string Contact { get; set; }
 
         /// <summary>
@@ -54,10 +54,24 @@ namespace OASystem.Domain.Entities.Resource
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
         public string ContactFax { get; set; }
 
+        /// <summary>
+        /// 车描述
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string CarDes { get; set; }
+
+        /// <summary>
+        /// 车图片路径
+        /// 存储多个 使用/r/n
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string CarPicPaths { get; set; }
+
+
         /// <summary>
         /// 其他信息
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
         public string OtherInfo { get; set; }
 
         /// <summary>
@@ -67,52 +81,66 @@ namespace OASystem.Domain.Entities.Resource
         public int Score { get; set; }
 
         /// <summary>
-        /// 着装得体
+        /// 相关的车辆资质
         /// A B C  选择
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
-        public string SuitScore { get; set; }
+        public string QualificationScore { get; set; }
 
         /// <summary>
-        /// 服务意识强度
+        /// 车辆2-4年新，VIP及以上需要2年新
         /// A B C  选择
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
-        public string ServeScore { get; set; }
+        public string CarAgeScore { get; set; }
 
         /// <summary>
-        /// 讲解水平专业
+        /// 车身干净，无文字图片等
         /// A B C  选择
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
-        public string TalkProScore { get; set; }
+        public string CleanImgScore { get; set; }
 
         /// <summary>
-        /// 时间概念强度
+        /// 车内整洁、无异味
         /// A B C  选择
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
-        public string TimeScore { get; set; }
+        public string SmellScore { get; set; }
+
+        /// <summary>
+        /// 提前备水，纸巾等
+        /// A B C  选择
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
+        public string WaterPaperScore { get; set; }
+
+        /// <summary>
+        /// 车辆配置高（皮座椅等）
+        /// A B C  选择
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
+        public string HardwareScore { get; set; }
 
         /// <summary>
-        /// 配合能力强，服从安排
+        /// 时间概念强
         /// A B C  选择
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
-        public string FitScore { get; set; }
+        public string TimeScore { get; set; }
 
         /// <summary>
-        /// 应变能力强
+        /// 安全意识高
         /// A B C  选择
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
-        public string StrainScore { get; set; }
+        public string SafetyScore { get; set; }
 
         /// <summary>
-        /// 当地语言和中文表达流畅
+        /// 司机驾龄时间长，提前熟悉路线
         /// A B C  选择
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
-        public string LocalAndChineseScore { get; set; }
+        public string DrivingAgeScore { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/Resource/Res_LocalGuideData.cs

@@ -33,7 +33,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 联系人
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string Contact { get; set; }
 
         /// <summary>
@@ -57,7 +57,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 其他信息
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
         public string OtherInfo { get; set; }
 
         /// <summary>

OASystem/OASystem.Domain/Entities/System/Sys_Department.cs

@@ -27,5 +27,7 @@ namespace OASystem.Domain.Entities.System
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int ParentDepId { get; set; }
+
+
     }
 }

OASystem/OASystem.Domain/Entities/System/Sys_Users.cs

@@ -162,7 +162,7 @@ namespace OASystem.Domain.Entities.System
     /// 用户表
     /// 数据库查询接受实体类
     /// </summary>
-    public class UserInfoView : Sys_Users
+    public class UserInfo : Sys_Users
     {
         /// <summary>
         /// 公司名称

OASystem/OASystem.Domain/ViewModels/CompanyView.cs

@@ -1,9 +1,4 @@
 using OASystem.Domain.Entities.System;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OASystem.Domain.ViewModels
 {
@@ -13,12 +8,20 @@ namespace OASystem.Domain.ViewModels
     public class CompanyView
     {
         /// <summary>
-        /// 公司Id
+        /// 公司id
         /// </summary>
         public int Id { get; set; }
         /// <summary>
+        /// 公司Code
+        /// </summary>
+        public string CompanyCode { get; set; }
+        /// <summary>
         /// 公司名称
         /// </summary>
         public string CompanyName { get; set; }
+        /// <summary>
+        /// 父级公司Id
+        /// </summary>
+        public int ParentCompanyId { get; set; }
     }
 }

OASystem/OASystem.Domain/ViewModels/LoginView.cs

@@ -15,5 +15,8 @@ public class LoginView
     /// </summary>
     public DateTime Expires { get; set; }
 
-
+    /// <summary>
+    /// 返回用户信息
+    /// </summary>
+    public object? UserInfo { get; set; }
 }

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

@@ -10,12 +10,23 @@ namespace OASystem.Domain.ViewModels.System
     public class DepartmentIView
     {
         /// <summary>
-        /// 用户Id
+        /// id
         /// </summary>
         public int Id { get; set; }
+
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+
         /// <summary>
         /// 部门名称
         /// </summary>
         public string DepName { get; set; }
+
+        /// <summary>
+        /// 父级部门Id
+        /// </summary>
+        public int ParentDepId { get; set; }
     }
 }

OASystem/OASystem.Domain/ViewModels/System/JobPostView.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.System
+{
+    /// <summary>
+    /// 下拉框/单名类视图类
+    /// </summary>
+    public class JobPostView
+    {
+        /// <summary>
+        /// 岗位Id
+        /// </summary>
+        public int Id{ get; set; }
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string JobName { get; set; }
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        public int DepId { get; set; }
+    }
+}

OASystem/OASystem.Domain/ViewModels/System/SetDataView.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.System
+{
+    public class SetDataView
+    {
+        public int Id { get; set; }
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// setdatatype id
+        /// </summary>
+        public int STid { get; set; }
+
+    }
+}

OASystem/OASystem.Domain/ViewModels/System/SystemMenuPermissionView.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.System
+{
+    public class SystemMenuPermissionView
+    {
+        public int Id { get; set; }
+        /// <summary>
+        /// 页面名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 页面code
+        /// </summary>
+        public string SystemMenuCode { get; set; }
+        
+        /// <summary>
+        /// 页面所属模块
+        /// </summary>
+        public int Mid { get; set; }
+
+    }
+}

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

@@ -7,20 +7,29 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.ViewModels.System
 {
-    
+
     /// <summary>
     /// 用户数据 数据库返回数据实体接受类
     /// 查询返回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
         /// </summary>
 
         public int DepId { get; set; }
-       
+
         /// <summary>
         /// 部门名称
         /// </summary>
@@ -36,105 +45,127 @@ 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 UserIWebView
+    public class UserLoginInfoView
     {
-        /// <summary>
-        /// 工号
-        /// </summary>
-        public string Number { get; set; }
+        ///// <summary>
+        ///// 工号
+        ///// </summary>
+        ////public string Number { get; set; }
 
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int Id { get; set; }
+        public int UserId { 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; }
+        public int DepId { get; set; }
 
+        /// <summary>
+        /// 用户信息 - 个人基本信息
+        /// </summary>
+        public class UserBasicInfoView
+        {
+            /// <summary>
+            /// 用户Id
+            /// </summary>
+            public string Id { get; set; }
+
+            /// <summary>
+            /// 岗位Id
+            /// </summary>
+            public int JobPostId { get; set; }
+            /// <summary>
+            /// 性别
+            /// 0 男1 女  2 未设置
+            /// </summary>
+
+            public int Sex { get; set; }
+
+            /// <summary>
+            /// 工号
+            /// </summary>
+            public string Number { get; set; }
+
+            /// <summary>
+            /// 公司名称
+            /// </summary>
+            public string CompanyName { get; set; }
+
+            /// <summary>
+            /// 部门名称
+            /// </summary>
+            public string DepName { get; set; }
+
+            /// <summary>
+            /// 岗位名称
+            /// </summary>
+            public string JobName { get; set; }
+
+            /// <summary>
+            /// 邮箱
+            /// </summary>
+            public string Email { get; set; }
+        }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/BaseRepository.cs

@@ -187,6 +187,10 @@ namespace OASystem.Infrastructure.Repositories
         {
             return _sqlSugar.Insertable(entity).ExecuteCommandAsync();
         }
+        public virtual int AddsAsync<T>(List<T> entity) where T : EntityBase, new()
+        {
+            return _sqlSugar.Insertable<T>(entity).ExecuteCommand();
+        }
         public virtual ISugarQueryable<T> Query<T>(Expression<Func<T, bool>> exp) where T : EntityBase, new()
         {
             return _sqlSugar.Queryable<T>().Where(s => s.IsDel < 1).Where(exp);

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

@@ -1,7 +1,12 @@
 
+using AutoMapper;
 using OASystem.Domain;
+using OASystem.Domain.Dtos.System;
 using OASystem.Domain.Dtos.UserDto;
 using OASystem.Domain.Entities.System;
+using OASystem.Domain.ViewModels.System;
+using OASystem.Infrastructure.Repositories.System;
+using SqlSugar;
 
 namespace OASystem.Infrastructure.Repositories.Login
 {
@@ -9,6 +14,7 @@ namespace OASystem.Infrastructure.Repositories.Login
     {
         public LoginRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
         {
+            
         }
 
         /// <summary>
@@ -18,22 +24,49 @@ namespace OASystem.Infrastructure.Repositories.Login
         /// <param name="_loginRep"></param>
         /// <param name="loginDto"></param>
         /// <returns></returns>
-        public async Task<Result> Login(LoginRepository _loginRep, LoginDto loginDto)
+        public async Task<Result> Login(LoginDto loginDto)
         {
-            Result result = new Result();
+            Result result = new Result() { Code = -2 };
             string SQLWhere = string.Format("Where Number='{0}' And Password='{1}'", loginDto.Number, loginDto.Password);
             string sql = string.Format("Select * From Sys_Users With(NoLock) {0}", SQLWhere);
-            Sys_Users _entity = await _loginRep.GetSingleInfoBySqlWithNolockAsync(sql);
+            Sys_Users _entity = await GetSingleInfoBySqlWithNolockAsync(sql);
+
+
             if (_entity == null)
             {
-                result.Code = -2;
                 result.Msg = "暂无该账号信息!";
+                return result;
+            }
+
+            //人事审核是否通过
+            if (_entity.HrAudit != 1)
+            {
+                result.Msg = "该员工账号暂无登录权限,人事审核未通过!";
+                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;
+            result.Data = _userBasicInfo;
             return result;
 
         }

OASystem/OASystem.Infrastructure/Repositories/System/CompanyRepository.cs

@@ -1,10 +1,5 @@
-using OASystem.Domain.Entities.System;
-using OASystem.Domain.ViewModels.System;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using OASystem.Domain;
+using OASystem.Domain.Entities.System;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
@@ -14,5 +9,39 @@ namespace OASystem.Infrastructure.Repositories.System
         {
 
         }
+
+        /// <summary>
+        /// 获取所有公司数据
+        /// </summary>
+        /// <param name="_CompanyRepository"></param>
+        /// <returns></returns>
+        public Result GetCompanyData()
+        {
+            Result result = new Result();
+
+            string sql = "select * from Sys_Company where isdel = 0";
+            var DBdata =  GetListBySqlWithNolock(sql);
+            if (DBdata == null || DBdata.Count == 0)
+            {
+                result.Code = -1;
+                result.Msg = "暂无数据！";
+                return result;
+            }
+
+            result.Code = 0;
+            result.Msg = "成功！";
+            result.Data = DBdata.Select(x=> new CompanyView
+            {
+                CompanyCode = x.CompanyCode,
+                CompanyName = x.CompanyName,
+                Id = x.Id,
+                ParentCompanyId = x.ParentCompanyId
+            });
+            return result;
+        }
+
+
+
+
     }
 }

OASystem/OASystem.Infrastructure/Repositories/System/DepartmentRepository.cs

@@ -1,18 +1,15 @@
-using OASystem.Domain.Dtos;
+using OASystem.Domain;
+using OASystem.Domain.Dtos.System;
 using OASystem.Domain.Entities.System;
 using OASystem.Domain.ViewModels.System;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
-    public class DepartmentRepository : BaseRepository<Sys_Department, DepartmentIView>
+    public class DepartmentRepository : BaseRepository<Sys_Department, DepartmentDto>
     {
         public DepartmentRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
         {
         }
+        
     }
 }

OASystem/OASystem.Infrastructure/Repositories/System/JobPostRepository.cs

@@ -0,0 +1,17 @@
+using OASystem.Domain.Dtos.System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Infrastructure.Repositories.System
+{
+    public class JobPostRepository : BaseRepository<Sys_JobPost, QueryJobPostDto>
+    {
+        public JobPostRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
+        {
+
+        }
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/System/SetDataRepository.cs

@@ -0,0 +1,47 @@
+
+using OASystem.Domain;
+using OASystem.Domain.Dtos.UserDto;
+using OASystem.Domain.Entities.System;
+using OASystem.Domain.ViewModels.System;
+
+namespace OASystem.Infrastructure.Repositories.System
+{
+    public class SetDataRepository : BaseRepository<Sys_SetData, SetDataView>
+    {
+        public SetDataRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
+        {
+
+        }
+
+        /// <summary>
+        /// 获取所有系统模块
+        /// </summary>
+        /// <param name="_SetData"></param>
+        /// <returns></returns>
+        public async Task<Result> GetSySDefultModule(SetDataRepository _SetData)
+        {
+            Result result = new Result();
+            string sql = "select * from Sys_SetData where STid = 5 and isdel = 0";
+            var DBdata = await _SetData.GetListBySqlWithNolockAsync(sql);
+
+            if (DBdata == null || DBdata.Count == 0)
+            {
+                return result;
+            }
+
+            result.Data = DBdata.Select(x=> new SetDataView
+            {
+                 Name = x.Name,
+                 STid = x.STid,
+                 Id = x.Id,
+            });
+
+            result.Code = 0;
+            result.Msg = "成功！";
+
+            return result;
+        }
+
+
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/System/SystemMenuPermissionRepository.cs

@@ -0,0 +1,72 @@
+using OASystem.Domain;
+using OASystem.Domain.Entities.System;
+using OASystem.Domain.ViewModels.System;
+
+namespace OASystem.Infrastructure.Repositories.System
+{
+    public class SystemMenuPermissionRepository : BaseRepository<Sys_SystemMenuPermission, SystemMenuPermissionView>
+    {
+        public SystemMenuPermissionRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
+        {
+
+        }
+
+        /// <summary>
+        /// 分页查询页面表
+        /// </summary>
+        /// <param name="_SystemMenuPermissionRepository"></param>
+        /// <param name="mid">模块id</param>
+        /// <param name="pageSize">行数</param>
+        /// <param name="currentPage">页码</param>
+        /// <returns></returns>
+        public Result GetSystemMenuViweData(SystemMenuPermissionRepository _SystemMenuPermissionRepository,int mid,int pageSize,int currentPage)
+        {
+            Result result = new Result();
+            if (currentPage == 0 || pageSize == 0)
+            {
+                return result;
+            }
+
+            string sql = $@"select top {pageSize} * from (select row_number() 
+                        over(order by id asc) as rownumber,*    
+                        from Sys_SystemMenuPermission where mid = {mid} and isdel = 0 and IsEnable = 1 ) temp_row
+                        where rownumber> {(currentPage - 1) * pageSize};";
+
+            var DBdata = _SystemMenuPermissionRepository.GetListBySqlWithNolock(sql);
+
+            if (DBdata == null || DBdata.Count == 0)
+            {
+                result.Code = -1;
+                result.Msg = "暂无数据！";
+                result.Data = new
+                {
+                    DBdata,
+                    total = 0
+                };
+                return result;
+            }
+
+            var total = _SystemMenuPermissionRepository.Query<Sys_SystemMenuPermission>(x => x.Mid == mid).Count();
+
+            result.Code = 0;
+            result.Msg = "成功！";
+            result.Data = new
+            {
+                DBdata = DBdata.Select(x => new SystemMenuPermissionView
+                {
+                    Id = x.Id,
+                    Name = x.Name,
+                    Mid = mid,
+                    SystemMenuCode = x.SystemMenuCode
+                }),
+                total = total
+            };
+            return result;
+        }
+
+
+
+
+
+    }
+}

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

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
-    public class UsersRepository : BaseRepository<UserInfoView, UserIView>
+    public class UsersRepository : BaseRepository<UserInfo, JsonView>
     {
         private readonly IMapper _mapper;
         public UsersRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
@@ -26,40 +26,73 @@ 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 = "暂无数据!";
                 }
             }
             else if (portType == 2) //Android
             {
-                List<UserIView> _userDataList = _mapper.Map<List<UserIView>>(_userList);
-                if (_userDataList.Count != 0)
+                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 = _userDataList;
+                    result.Data = _userList;
                 }
                 else
                 {
-                    result.Code = -1;
                     result.Msg = "暂无数据!";
                 }
             }
@@ -68,7 +101,6 @@ namespace OASystem.Infrastructure.Repositories.System
             }
             else
             {
-                result.Code = -1;
                 result.Msg = "暂无数据!";
             } 
             

OASystem/OASystem.RedisRepository/RedisAsyncHelper/IRedisHelper.cs

@@ -304,14 +304,14 @@ namespace OASystem.RedisRepository.RedisAsyncHelper
         /// <returns></returns>
         Task<bool> SetAddAsync<T>(string key, T value);
 
-        /// <summary>
-        /// 指定集合计算操作operation枚举，指定计算结果将存的目标destKey，指定需要参与计算的多个key
-        /// </summary>
-        /// <param name="operation"></param>
-        /// <param name="destKey"></param>
-        /// <param name="combineKeys"></param>
-        /// <returns></returns>
-        Task<long> SetCombineAndStoreAsync(SetOperation operation, string destKey, List<string> combineKeys);
+        ///// <summary>
+        ///// 指定集合计算操作operation枚举，指定计算结果将存的目标destKey，指定需要参与计算的多个key
+        ///// </summary>
+        ///// <param name="operation"></param>
+        ///// <param name="destKey"></param>
+        ///// <param name="combineKeys"></param>
+        ///// <returns></returns>
+        //Task<long> SetCombineAndStoreAsync(SetOperation operation, string destKey, List<string> combineKeys);
 
         ///// <summary>
         ///// 指定集合计算操作operation枚举，指定需要参与计算的多个key