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

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -6,6 +6,7 @@ using System.Security.Claims;
 using StackExchange.Redis;
 using OASystem.Domain.Dtos.UserDto;
 using OASystem.RedisRepository;
+using OASystem.Infrastructure.Repositories.System;
 
 namespace OASystem.API.Controllers
 {
@@ -19,13 +20,21 @@ namespace OASystem.API.Controllers
         private readonly IConfiguration _config;
         private readonly LoginRepository _loginRep;
         private readonly UsersRepository _usersRepository;
-        //private IDatabase _redis;
+        private readonly SetDataRepository _setDataRepository;
+        private readonly SystemMenuPermissionRepository _SystemMenuPermissionRepository;
+        private readonly CompanyRepository _CompanyRepository;
+        //private IDatabase _redis; 
         //private RedisHelper _redisHelper;
-        public AuthController(IConfiguration config, LoginRepository loginRep, IMapper mapper)
+        public AuthController(IConfiguration config, LoginRepository loginRep, IMapper mapper, 
+            SetDataRepository setDataRepository, CompanyRepository companyRepository, 
+            SystemMenuPermissionRepository systemMenuPermissionRepository)
         {
             _config = config;
             _loginRep = loginRep;
             _mapper = mapper;
+            _setDataRepository = setDataRepository;
+            _CompanyRepository = companyRepository;
+            _SystemMenuPermissionRepository = systemMenuPermissionRepository;
             //_usersRepository = usersRepository;
         }
 
@@ -147,5 +156,79 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(view));
         }
+
+        /// <summary>
+        /// 权限数据页面初始化
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [Authorize]
+        [HttpPost("GetAuth")]
+        [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(_CompanyRepository);
+            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));
+        }
+
+        /// <summary>
+        /// 查询部门
+        /// </summary>
+        /// <param name="companyid"></param>
+        /// <returns></returns>
+        [Authorize]
+        [HttpPost("QueryDepartmentListByCompId")]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public IActionResult QueryDepartmentListByCompId(int companyid)
+        {
+
+
+
+
+
+            return Ok(JsonView(""));
+        }
+
+
+
+
     }
 }

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
     {
@@ -400,6 +400,14 @@ 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
 
     }

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/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/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; }
+        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/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/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,40 +45,46 @@ 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>
         ///// 工号
@@ -100,59 +115,57 @@ namespace OASystem.Domain.ViewModels.System
         /// 岗位名称
         /// </summary>
         public string JobName { get; set; }
-       
-        /// <summary>
-        /// 邮箱
-        /// </summary>
-        public string Email { get; set; }
-
-    }
 
-    /// <summary>
-    /// 用户信息 - 个人基本信息
-    /// </summary>
-    public class UserBasicInfoView 
-    {
         /// <summary>
-        /// 用户Id
-        /// </summary>
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 中文姓名
-        /// </summary>
-        public string CnName { 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; }
+        public int DepId { get; set; }
 
         /// <summary>
-        /// 邮箱
-        /// </summary>
-        public string Email { get; set; }
+        /// 用户信息 - 个人基本信息
+        /// </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/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/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(CompanyRepository _CompanyRepository)
+        {
+            Result result = new Result();
+
+            string sql = "select * from Sys_Company where isdel = 0";
+            var DBdata =  _CompanyRepository.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,11 +1,6 @@
-using OASystem.Domain.Dtos;
+using OASystem.Domain;
 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
 {
@@ -14,5 +9,6 @@ namespace OASystem.Infrastructure.Repositories.System
         public DepartmentRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
         {
         }
+        
     }
 }

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,
-                //                                  	     sjp.JobName,su.Id UserId,su.CnName,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();
+                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 = _userList;
-                //}
-                //else
-                //{
-                //    result.Msg = "暂无数据!";
-                //}
+                if (_userList.Count != 0)
+                {
+                    result.Code = 0;
+                    result.Msg = "成功!";
+                    result.Data = _userList;
+                }
+                else
+                {
+                    result.Msg = "暂无数据!";
+                }
             }
             else if (portType == 2) //Android
             {