Kaynağa Gözat

根据Id获取员工所有移动端查看权限

jiangjc 9 ay önce
ebeveyn
işleme
ff869c2b64

+ 129 - 87
OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1,5 +1,6 @@
 
 using AutoMapper.Execution;
+using EyeSoft.Collections.Generic;
 using Google.Protobuf.WellKnownTypes;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
@@ -41,12 +42,12 @@ namespace OASystem.API.Controllers
         private readonly List<int> _operationTypeList = new List<int>() { 1, 2, 3, 4, 5 }; //操作通知所属类型
         private readonly List<int> _taskTypeList = new List<int>() { 6 };//任务通知 TaskNotification
 
-        public SystemController( CompanyRepository syscom, DepartmentRepository sysDepRep, UsersRepository userRep,
-            IMapper mapper,SqlSugarClient sqlSugar, SetDataRepository setDataRepository, CompanyRepository companyRepository,
+        public SystemController(CompanyRepository syscom, DepartmentRepository sysDepRep, UsersRepository userRep,
+            IMapper mapper, SqlSugarClient sqlSugar, SetDataRepository setDataRepository, CompanyRepository companyRepository,
             SystemMenuPermissionRepository systemMenuPermissionRepository, PageFunctionPermissionRepository pageFunctionPermissionRepository,
-            SystemMenuAndFunctionRepository systemMenuAndFunctionRepository, JobPostAuthorityRepository jobPostAuthorityRepository, 
-            JobPostRepository jobRep,UserAuthorityRepository userAuthorityRepository, MessageRepository messageRep,SetDataTypeRepository setDataTypeRep)
-            
+            SystemMenuAndFunctionRepository systemMenuAndFunctionRepository, JobPostAuthorityRepository jobPostAuthorityRepository,
+            JobPostRepository jobRep, UserAuthorityRepository userAuthorityRepository, MessageRepository messageRep, SetDataTypeRepository setDataTypeRep)
+
         {
             _syscomRep = syscom;
             _sysDepRep = sysDepRep;
@@ -117,7 +118,7 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(true, msgData.Msg, msgData.Data));
         }
-        
+
         /// <summary>
         /// 系统消息
         /// 消息List  2024-03-06 14:54
@@ -141,7 +142,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "消息类型不存在"));
             }
 
-            if (!typeData.Contains( dto.Type))
+            if (!typeData.Contains(dto.Type))
             {
                 return Ok(JsonView(false, "请输入有效的Type参数。1021 团组操作通知 1020 任务操作通知 "));
             }
@@ -175,7 +176,7 @@ namespace OASystem.API.Controllers
             {
                 typeStr = String.Join(",", messageTypeViews.Where(it => it.TypeId == 1022).FirstOrDefault().MsgTypeIds.ToList());
             }
-           
+
             if (!string.IsNullOrEmpty(typeStr))
             {
                 msgSqlWhere += $" And sm.Type In ({typeStr})";
@@ -209,12 +210,12 @@ namespace OASystem.API.Controllers
 
                 return Ok(JsonView(true, "操作成功!", data, totalCount));
             }
-            catch (Exception ex )
+            catch (Exception ex)
             {
 
                 return Ok(JsonView(false, ex.Message));
             }
-           
+
         }
 
 
@@ -285,7 +286,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, msgData.Msg));
             }
 
-            return Ok(JsonView(true, "操作成功!",msgData.Data));
+            return Ok(JsonView(true, "操作成功!", msgData.Data));
         }
 
         /// <summary>
@@ -343,7 +344,7 @@ namespace OASystem.API.Controllers
                 {
                     return Ok(JsonView(false, "请传类型Id!"));
                 }
-                var setData = _setDataRepository.QueryDto<Sys_SetData, SetDataView>(s => s.STid == dto.DataType && s.IsDel==0).ToList();
+                var setData = _setDataRepository.QueryDto<Sys_SetData, SetDataView>(s => s.STid == dto.DataType && s.IsDel == 0).ToList();
                 if (setData.Count == 0)
                 {
                     return Ok(JsonView(false, "暂无数据!"));
@@ -549,14 +550,14 @@ namespace OASystem.API.Controllers
                         {
                             companyListView[i].ParentCompanyName = companyListView.Find(x => x.Id == companyListView[i].ParentCompanyId).CompanyName;
                         }
-                        if (companyListView[i].ContactUserId!=0)
+                        if (companyListView[i].ContactUserId != 0)
                         {
-                            var user = _userRep.QueryDto<Sys_Users,UserInfoWebView>(x => x.Id == companyListView[i].ContactUserId).ToList();
-                            if (user.Count!=0)
+                            var user = _userRep.QueryDto<Sys_Users, UserInfoWebView>(x => x.Id == companyListView[i].ContactUserId).ToList();
+                            if (user.Count != 0)
                             {
                                 companyListView[i].ContactUserName = user[0].CnName;
                             }
-                           
+
                         }
 
                     }
@@ -569,8 +570,8 @@ namespace OASystem.API.Controllers
                     {
                         return Ok(JsonView(CompanyDataResult.Msg));
                     }
-                    
-                    return Ok(JsonView(true,"查询成功!", CompanyDataResult.Data));
+
+                    return Ok(JsonView(true, "查询成功!", CompanyDataResult.Data));
                 }
                 else if (dto.PortType == 3)
                 {
@@ -594,7 +595,7 @@ namespace OASystem.API.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost]
-        [ProducesResponseType(typeof(JsonView),StatusCodes.Status200OK)]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> AddCompany(AddCompanyDto dto)
         {
             try
@@ -616,7 +617,7 @@ namespace OASystem.API.Controllers
                         return Ok(JsonView(false, "添加失败!"));
 
                     }
-                    return Ok(JsonView(true,"添加成功"));
+                    return Ok(JsonView(true, "添加成功"));
                 }
             }
             catch (Exception)
@@ -624,8 +625,8 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "程序错误!"));
                 throw;
             }
-            
-            
+
+
         }
 
         /// <summary>
@@ -635,11 +636,11 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult>EditCompany(EditCompanyDto dto)
+        public async Task<IActionResult> EditCompany(EditCompanyDto dto)
         {
             try
             {
-                if (string.IsNullOrWhiteSpace(dto.CompanyName) || string.IsNullOrWhiteSpace(dto.CompanyCode) || string.IsNullOrWhiteSpace(dto.Address)  || dto.ContactUserId == 0)
+                if (string.IsNullOrWhiteSpace(dto.CompanyName) || string.IsNullOrWhiteSpace(dto.CompanyCode) || string.IsNullOrWhiteSpace(dto.Address) || dto.ContactUserId == 0)
                 {
                     return Ok(JsonView(false, "请检查信息是否输入完整!"));
                 }
@@ -657,10 +658,10 @@ namespace OASystem.API.Controllers
                         ParentCompanyId = dto.ParentCompanyId,
                         Tel = dto.Tel,
                         ContactUserId = dto.ContactUserId,
-                        Remark=dto.Remark,
+                        Remark = dto.Remark,
                     });
                     if (!res) { return Ok(JsonView(false, "修改失败")); }
-                    return Ok(JsonView(true,"修改成功!"));
+                    return Ok(JsonView(true, "修改成功!"));
                 }
             }
             catch (Exception)
@@ -668,11 +669,11 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "程序错误!"));
                 throw;
             }
-            
-            
+
+
         }
 
-         /// <summary>
+        /// <summary>
         /// 企业删除
         /// </summary>
         /// <param name="dto"></param>
@@ -692,8 +693,8 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "程序错误!"));
                 throw;
             }
-           
-            
+
+
 
         }
         #endregion
@@ -705,16 +706,16 @@ namespace OASystem.API.Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        
+
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryDepartmentList(DepartmentDto dto)
         {
             try
             {
-                if (dto.PortType==1)
+                if (dto.PortType == 1)
                 {
-                    if (dto.CompanyId!=0)
+                    if (dto.CompanyId != 0)
                     {
                         var result = _sysDepRep.QueryDto<Sys_Department, DepartmentIView>(s => s.CompanyId == dto.CompanyId).ToList();
                         if (result.Count == 0)
@@ -738,7 +739,7 @@ namespace OASystem.API.Controllers
                     }
                     else
                     {
-                        var result = _sysDepRep.QueryDto<Sys_Department, DepartmentIView>(s => s.IsDel <=1).ToList();
+                        var result = _sysDepRep.QueryDto<Sys_Department, DepartmentIView>(s => s.IsDel <= 1).ToList();
                         if (result.Count == 0)
                         {
 
@@ -762,14 +763,14 @@ namespace OASystem.API.Controllers
 
 
                 }
-                else if (dto.PortType==2)
+                else if (dto.PortType == 2)
                 {
                     var result = _sysDepRep.QueryDto<Sys_Department, DepartmentIView>(s => s.CompanyId == dto.CompanyId).ToList();
                     if (result.Count == 0)
                     {
                         return Ok(JsonView(400, "暂无数据!", new List<string>()));
                     }
-                    return Ok(JsonView(true,"查询成功!",result));
+                    return Ok(JsonView(true, "查询成功!", result));
                 }
                 else if (dto.PortType == 3)
                 {
@@ -785,7 +786,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "程序错误!"));
                 throw;
             }
-         
+
         }
         /// <summary>
         /// 部门添加
@@ -818,8 +819,8 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "程序错误!"));
                 throw;
             }
-            
-           
+
+
         }
 
         /// <summary>
@@ -833,7 +834,7 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                if (dto.Id==0 || string.IsNullOrWhiteSpace(dto.DepName) || dto.CompanyId == 0 || string.IsNullOrWhiteSpace(dto.DepCode))
+                if (dto.Id == 0 || string.IsNullOrWhiteSpace(dto.DepName) || dto.CompanyId == 0 || string.IsNullOrWhiteSpace(dto.DepCode))
                 {
                     return Ok(JsonView(false, "请检查信息是否输入完整!"));
                 }
@@ -841,12 +842,12 @@ namespace OASystem.API.Controllers
                 {
                     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,
-                     });
+                        CompanyId = dto.CompanyId,
+                        DepCode = dto.DepCode,
+                        DepName = dto.DepName,
+                        ParentDepId = dto.ParentDepId,
+                        Remark = dto.Remark,
+                    });
                     if (!res)
                     {
                         return Ok(JsonView(false, "修改失败!"));
@@ -880,7 +881,7 @@ namespace OASystem.API.Controllers
                 }
                 else
                 {
-                    bool res =await _sysDepRep.SoftDeleteAsync<Sys_Department>(dto.Id.ToString());
+                    bool res = await _sysDepRep.SoftDeleteAsync<Sys_Department>(dto.Id.ToString());
                     if (!res)
                     {
                         return Ok(JsonView(false, "删除失败!"));
@@ -938,7 +939,7 @@ namespace OASystem.API.Controllers
                 }
                 else if (dto.PortType == 2)
                 {
-                    var result = _jobRep.QueryDto<Sys_JobPost, JobPostView>(s => s.CompanyId == dto.CompanyId && s.DepId==dto.DepId).ToList();
+                    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, "暂无数据!"));
@@ -996,12 +997,12 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                bool res = await _jobRep.UpdateAsync<Sys_JobPost>(a=>a.Id==dto.Id,a =>new Sys_JobPost
+                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,
+                    CompanyId = dto.CompanyId,
+                    DepId = dto.DepId,
+                    JobName = dto.JobName,
+                    Remark = dto.Remark,
                 });
                 if (!res)
                 {
@@ -1107,7 +1108,7 @@ namespace OASystem.API.Controllers
             try
             {
                 string sqlWhere = string.Format(" Where su.IsDel = 0 ");
-                if (dto.CompanyId!=0)
+                if (dto.CompanyId != 0)
                 {
                     sqlWhere += string.Format(@" And su.CompanyId={0}", dto.CompanyId);
                 }
@@ -1119,21 +1120,21 @@ namespace OASystem.API.Controllers
                 {
                     sqlWhere += string.Format(@" And su.JobPostId={0}", dto.JobPostId);
                 }
-               
-                List<UserInfo> _userList =await _userRep.QueryUser(sqlWhere);
+
+                List<UserInfo> _userList = await _userRep.QueryUser(sqlWhere);
                 if (_userList.Count == 0)
                 {
                     return Ok(JsonView(400, "暂无数据!", new List<String>()));
                 }
                 List<UserInfoWebView> userList = _mapper.Map<List<UserInfoWebView>>(_userList);
-                return Ok(JsonView(true,"查询成功!", userList));
+                return Ok(JsonView(true, "查询成功!", userList));
             }
             catch (Exception)
             {
                 return Ok(JsonView(false, "程序错误!"));
                 throw;
             }
-           
+
         }
 
         /// <summary>
@@ -1157,7 +1158,7 @@ namespace OASystem.API.Controllers
                     UsePeriod = dto.UsePeriod,
                     //HrAudit = dto.HrAudit
                 });
-                if (!res) 
+                if (!res)
                 {
                     return Ok(JsonView(false, "修改失败!"));
                 }
@@ -1182,7 +1183,7 @@ namespace OASystem.API.Controllers
             try
             {
                 if (string.IsNullOrWhiteSpace(dto.CnName) || string.IsNullOrWhiteSpace(dto.Address) || string.IsNullOrWhiteSpace(dto.IDCard) || dto.Sex != 0 && dto.Sex != 1 ||
-                    string.IsNullOrWhiteSpace(dto.MaritalStatus) || string.IsNullOrWhiteSpace(dto.HomeAddress)|| dto.Birthday>=DateTime.Now.AddYears(-1))
+                    string.IsNullOrWhiteSpace(dto.MaritalStatus) || string.IsNullOrWhiteSpace(dto.HomeAddress) || dto.Birthday >= DateTime.Now.AddYears(-1))
                 {
                     return Ok(JsonView(false, "请完善你的个人信息!"));
                 }
@@ -1223,7 +1224,7 @@ namespace OASystem.API.Controllers
                     }
                     return Ok(JsonView(true, "修改成功!"));
                 }
-                
+
             }
             catch (Exception)
             {
@@ -1248,16 +1249,16 @@ namespace OASystem.API.Controllers
                 {
                     return Ok(JsonView(false, "参数不能为空!"));
                 }
-                Sys_Users _Users=_sqlSugar.Queryable<Sys_Users>().First(a=>a.IsDel==0 && a.Id==dto.Id);
+                Sys_Users _Users = _sqlSugar.Queryable<Sys_Users>().First(a => a.IsDel == 0 && a.Id == dto.Id);
                 if (_Users != null)
                 {
-                    List<Sys_Users> sys_UsersList=_sqlSugar.Queryable<Sys_Users>().Where(a=>a.IsDel==0 && a.CompanyId==_Users.CompanyId).ToList();
-                    if (sys_UsersList.Count==1)
+                    List<Sys_Users> sys_UsersList = _sqlSugar.Queryable<Sys_Users>().Where(a => a.IsDel == 0 && a.CompanyId == _Users.CompanyId).ToList();
+                    if (sys_UsersList.Count == 1)
                     {
                         return Ok(JsonView(false, "该人员为公司最后一位,不可删除!"));
                     }
                 }
-                
+
                 bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users
                 {
                     IsDel = 1,
@@ -1336,14 +1337,14 @@ namespace OASystem.API.Controllers
             }
 
             //操作方式
-            var PageOperation = _PageFunctionPermissionRepository.QueryDto<Sys_PageFunctionPermission, Sys_PageFunctionPermission>(x=>x.IsEnable == 1).ToList();
+            var PageOperation = _PageFunctionPermissionRepository.QueryDto<Sys_PageFunctionPermission, Sys_PageFunctionPermission>(x => x.IsEnable == 1).ToList();
 
             //获取所有关联页面
             var Sys_SystemMenuAndFunction = _SystemMenuAndFunctionRepository.QueryDto<Sys_SystemMenuAndFunction, SystemMenuAndFunctionView>().ToList();
 
 
             //页面数据
-            var SystemMenuPermissionData = _SystemMenuPermissionRepository.QueryDto<Sys_SystemMenuPermission, SystemMenuPermissionView>(x=>x.Mid == dto.moduleId && x.IsEnable == 1).ToList();
+            var SystemMenuPermissionData = _SystemMenuPermissionRepository.QueryDto<Sys_SystemMenuPermission, SystemMenuPermissionView>(x => x.Mid == dto.moduleId && x.IsEnable == 1).ToList();
             if (SystemMenuPermissionData == null || SystemMenuPermissionData.Count() == 0)
             {
                 return Ok(JsonView("暂无数据"));
@@ -1356,7 +1357,7 @@ namespace OASystem.API.Controllers
                 ArrayList ids = new ArrayList();
                 foreach (var viewop in PageOperation)
                 {
-                    var op =  Sys_SystemMenuAndFunction.FirstOrDefault(x => x.SmId == item.Id && x.FId == viewop.Id);
+                    var op = Sys_SystemMenuAndFunction.FirstOrDefault(x => x.SmId == item.Id && x.FId == viewop.Id);
                     if (op != null)
                     {
                         ids.Add(viewop.Id);
@@ -1370,7 +1371,7 @@ namespace OASystem.API.Controllers
                     SystemMenuCode = item.SystemMenuCode,
                     opList = ids,
                     selList = new string[0]
-                }) ;
+                });
             }
 
             //公司数据
@@ -1402,7 +1403,7 @@ namespace OASystem.API.Controllers
         public IActionResult QueryJobAuth(QueryJobAuthDto dto)
         {
             //选中的操作权限
-            var DBdata = _JobPostAuthorityRepository.QueryDto<Sys_JobPostAuthority, JobPostAuthorityView>(x=>x.JpId == dto.jobid).ToList();
+            var DBdata = _JobPostAuthorityRepository.QueryDto<Sys_JobPostAuthority, JobPostAuthorityView>(x => x.JpId == dto.jobid).ToList();
             var SystemMenuPermissionData = _SystemMenuPermissionRepository.QueryDto<Sys_SystemMenuPermission, SystemMenuPermissionView>(x => x.Mid == dto.moduleId).ToList();
             if (SystemMenuPermissionData == null || SystemMenuPermissionData.Count() == 0)
             {
@@ -1430,7 +1431,7 @@ namespace OASystem.API.Controllers
                 }
 
                 //获取本职务的页面拥有的权限
-                var DBwhere =  DBdata.Where(x => x.SmId == item.Id && x.JpId == dto.jobid).ToList();
+                var DBwhere = DBdata.Where(x => x.SmId == item.Id && x.JpId == dto.jobid).ToList();
 
                 viewData.Add(new
                 {
@@ -1440,7 +1441,7 @@ namespace OASystem.API.Controllers
                     SystemMenuCode = item.SystemMenuCode,
                     opList = ids,
                     selList = DBwhere.Select(x => x.FId)
-                }) ;
+                });
             }
 
             return Ok(JsonView(200, "成功!", viewData));
@@ -1513,9 +1514,9 @@ namespace OASystem.API.Controllers
                     {
                         //删除个人级岗位权限
                         isdel = await _UserAuthorityRepository.DeletesAsync<Sys_UserAuthority>
-                            (RemoveUserAuthorityListAndTemp.FindAll(x=>x.UId == user.Id));
+                            (RemoveUserAuthorityListAndTemp.FindAll(x => x.UId == user.Id));
 
-                        userAuth = adds.Select(x=> new Sys_UserAuthority
+                        userAuth = adds.Select(x => new Sys_UserAuthority
                         {
                             CreateTime = DateTime.Now,
                             CreateUserId = dto.UserId,
@@ -1559,7 +1560,7 @@ namespace OASystem.API.Controllers
             }
 
             //所有操作
-            var PageOperation = _PageFunctionPermissionRepository.QueryDto<Sys_PageFunctionPermission, Sys_PageFunctionPermission>(x=>x.IsEnable == 1).ToList();
+            var PageOperation = _PageFunctionPermissionRepository.QueryDto<Sys_PageFunctionPermission, Sys_PageFunctionPermission>(x => x.IsEnable == 1).ToList();
 
             //获取所有关联页面
             var Sys_SystemMenuAndFunction = _SystemMenuAndFunctionRepository.QueryDto<Sys_SystemMenuAndFunction, SystemMenuAndFunctionView>().ToList();
@@ -1596,6 +1597,46 @@ namespace OASystem.API.Controllers
         }
 
 
+        /// <summary>
+        /// 根据Id获取员工所有移动端查看权限
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public IActionResult QueryUserAuthByUserId(QueryUserAuthByUserIdDto dto)
+        {
+            string sql = string.Format(@" Select sd1.Id as ModuleId,sd1.Name as ModuleName,sm.Id as MenuId,sm.Name as MenuName From Sys_UserAuthority as u With(Nolock) 
+Inner Join Sys_SystemMenuPermission as sm With(Nolock) On u.SmId = sm.Id
+Inner Join Sys_SetData as sd1 With(Nolock) On sm.Mid = sd1.Id
+Where u.IsDel = 0 And sm.IsDel = 0
+And u.UId = {0} And u.FId = 1 ", dto.UserId);
+
+            List<SystemModule_UserAuthSqlView> _dataSource = _sqlSugar.SqlQueryable<SystemModule_UserAuthSqlView>(sql).ToList();
+            List<SystemModule_UserAuthView> result = new List<SystemModule_UserAuthView>();
+
+            foreach (SystemModule_UserAuthSqlView item in _dataSource)
+            {
+                if (result.FirstOrDefault(s => s.ModuleId == item.ModuleId) == null)
+                {
+                    List<SystemModule_UserAuthSqlView> tempList = _dataSource.Where(s => s.ModuleId == item.ModuleId).ToList();
+                    List<SystemMenu_UserAuthView> menuList = new List<SystemMenu_UserAuthView>();
+
+                    foreach (SystemModule_UserAuthSqlView item2 in tempList)
+                    {
+                        SystemMenu_UserAuthView menu = new SystemMenu_UserAuthView() { MenuId = item2.MenuId, MenuName = item2.MenuName };
+                        menuList.Add(menu);
+                    }
+
+                    SystemModule_UserAuthView module = new SystemModule_UserAuthView() { MenuList = menuList, ModuleId = item.ModuleId, ModuleName = item.ModuleName };
+
+                    result.Add(module);
+                }
+            }
+
+            return Ok(JsonView(200, "成功!", result));
+        }
+
         /// <summary>
         /// 保存员工权限
         /// </summary>
@@ -1699,7 +1740,7 @@ namespace OASystem.API.Controllers
             JsonView view = null;
             _SystemMenuPermissionRepository.BeginTran();
 
-            var istrue = await _SystemMenuPermissionRepository.UpdateAsync(x=>x.Id == dto.Pageid ,x=> new Sys_SystemMenuPermission
+            var istrue = await _SystemMenuPermissionRepository.UpdateAsync(x => x.Id == dto.Pageid, x => new Sys_SystemMenuPermission
             {
                 AndroidUrl = dto.AndroidUrl,
                 CreateTime = DateTime.Now,
@@ -1735,7 +1776,7 @@ namespace OASystem.API.Controllers
                         IsDel = 0,
                     });
                 }
-               int number = _SystemMenuAndFunctionRepository.Adds<Sys_SystemMenuAndFunction>(binFun);
+                int number = _SystemMenuAndFunctionRepository.Adds<Sys_SystemMenuAndFunction>(binFun);
 
                 view = JsonView(istrue);
                 _SystemMenuPermissionRepository.CommitTran();
@@ -1747,7 +1788,7 @@ namespace OASystem.API.Controllers
             }
             return Ok(view);
         }
-        
+
 
         /// <summary>
         /// 添加一个页面
@@ -1793,7 +1834,7 @@ namespace OASystem.API.Controllers
                 });
             }
 
-            number =  _SystemMenuAndFunctionRepository.Adds<Sys_SystemMenuAndFunction>(binFun);
+            number = _SystemMenuAndFunctionRepository.Adds<Sys_SystemMenuAndFunction>(binFun);
 
             if (number > 0)
             {
@@ -1833,7 +1874,7 @@ namespace OASystem.API.Controllers
                             throw new Exception("修改失败");
                         }
                     }
-                    
+
                     view.Code = 200;
                     view.Msg = "删除成功!";
                     view.Data = istrue;
@@ -1846,7 +1887,7 @@ namespace OASystem.API.Controllers
             }
             return Ok(JsonView(view));
         }
-        
+
         /// <summary>
         /// 获取页面绑定的操作
         /// </summary>
@@ -1857,11 +1898,11 @@ namespace OASystem.API.Controllers
         public async Task<IActionResult> QueryPageFunById(PageFunDto Dto)
         {
             //页面与操作关联表
-            var pageAndFunList =  _SystemMenuAndFunctionRepository.QueryDto<Sys_SystemMenuAndFunction, SystemMenuAndFunctionView>().ToList();
+            var pageAndFunList = _SystemMenuAndFunctionRepository.QueryDto<Sys_SystemMenuAndFunction, SystemMenuAndFunctionView>().ToList();
             //页面功能表
             var pageFunList = _PageFunctionPermissionRepository.QueryDto<Sys_PageFunctionPermission, Sys_PageFunctionPermission>(x => x.IsEnable == 1).ToList();
 
-            ArrayList arr = new ArrayList();  
+            ArrayList arr = new ArrayList();
             foreach (var item in pageFunList)
             {
                 var FindVal = pageAndFunList.Find(x => x.SmId == Dto.Pageid && x.FId == item.Id);
@@ -1871,12 +1912,13 @@ namespace OASystem.API.Controllers
                     {
                         id = item.Id,
                         name = item.FunctionName,
-                        value =false
+                        value = false
                     });
                 }
                 else
                 {
-                    arr.Add( new {
+                    arr.Add(new
+                    {
                         id = item.Id,
                         name = item.FunctionName,
                         value = true
@@ -1959,7 +2001,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "程序错误!"));
             }
         }
-        
+
         #endregion
     }
 }

+ 5 - 0
OASystem/OASystem.Domain/Dtos/System/QueryUserAuthDto.cs

@@ -12,4 +12,9 @@ namespace OASystem.Domain.Dtos.System
 
         public int moduleId { get; set; }
     }
+
+    public class QueryUserAuthByUserIdDto
+    {
+        public int UserId { get; set; }
+    }
 }

+ 20 - 0
OASystem/OASystem.Domain/ViewModels/System/SystemMenuAndFunctionView.cs

@@ -17,4 +17,24 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         public int FId { get; set; }
     }
+
+    public class SystemModule_UserAuthSqlView
+    {
+        public int ModuleId { get; set; }
+        public string ModuleName { get; set; }
+        public int MenuId { get; set; }
+        public string MenuName { get; set; }
+    }
+
+    public class SystemModule_UserAuthView
+    {
+        public int ModuleId { get; set; }
+        public string ModuleName { get; set; }
+        public List<SystemMenu_UserAuthView> MenuList { get; set; }
+    }
+    public class SystemMenu_UserAuthView
+    {
+        public int MenuId { get; set; }
+        public string MenuName { get; set; }
+    }
 }