合并邀请资料下拉列表项Api

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -377,7 +377,6 @@ namespace OASystem.API.Controllers
                 }
             }
 
-
             return Ok(JsonView(true));
         }
 

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1054,9 +1054,7 @@ namespace OASystem.API.Controllers
             try
             {
                 string groupName = groupInfo.TeamName;
-                List<Sys_Users> listUser = _airTicketResRep.Query<Sys_Users>(s => s.DepId == 7 && s.IsDel == 0).ToList();
-                List<int> userIds = new List<int>();
-                listUser.ForEach(s => userIds.Add(s.Id));
+                var userIds = _airTicketResRep.Query<Sys_Users>(s => s.DepId == 7 && s.IsDel == 0).Select(x => x.Id).ToList();
                 string title = $"系统通知";
                 string content = $"团组[{groupName}]已确认出团!";
                 await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.GroupBusinessOperations, title, content, userIds, dto.GroupId);
@@ -8012,7 +8010,7 @@ FROM
                     })
                     .Where(x => x.Id == id)
                     .ExecuteCommandAsync();
-                if (upd > 0) return Ok(JsonView(false));
+                if (upd <1) return Ok(JsonView(false));
 
             }
 
@@ -8051,17 +8049,17 @@ FROM
 
             var infos1 = _mapper.Map<List<Grp_DayAndCost>>(dto.Infos);
             var infos = infos1.Select(x => new Grp_DayAndCost
-            {
-                Id = x.Id,
-                DiId = dto.DiId,
-                Type = dto.FeeType,
-                Days = x.Days,
-                NationalTravelFeeId = x.NationalTravelFeeId,
-                Cost = x.Cost,
-                Currency = x.Currency,
-                SubTotal = x.SubTotal,
-                CreateUserId = dto.CurrUserId
-            })
+                {
+                    Id = x.Id,
+                    DiId = dto.DiId,
+                    Type = dto.FeeType,
+                    Days = x.Days,
+                    NationalTravelFeeId = x.NationalTravelFeeId,
+                    Cost = x.Cost,
+                    Currency = x.Currency,
+                    SubTotal = x.SubTotal,
+                    CreateUserId = dto.CurrUserId
+                })
                 .ToList();
 
             var adds = infos.Where(x => x.Id <= 0).ToList();

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -979,35 +979,27 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationInit(TaskAllocationInitDto dto)
         {
-            try
-            {
-                #region  参数验证
-                if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
-                if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
+            #region  参数验证
+            if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+            if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
 
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
-
-                if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限!"));
-                #endregion
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
-                #endregion
+            if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限!"));
+            #endregion
 
-                var _view = await _taskAllocationRep._Init(dto.PortType, dto.UserId);
-                if (_view.Code == 0)
-                {
-                    return Ok(JsonView(true, "查询成功!", _view.Data));
-                }
+            #endregion
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
+            var _view = await _taskAllocationRep._Init(dto.PortType, dto.UserId);
+            if (_view.Code == 0)
             {
-
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "查询成功!", _view.Data));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         /// <summary>
@@ -1019,55 +1011,53 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationPage(TaskAllocationPageDto dto)
         {
-            try
-            {
-                #region  参数验证
-                if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
-                if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
+            #region  参数验证
+            if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+            if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
 
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
-                if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限!"));
-                #endregion
+            if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限!"));
+            #endregion
 
-                #endregion
+            #endregion
 
-                string whereSql = "";
-                #region 分页参数处理
+            string whereSql = "";
+            #region 分页参数处理
 
 
-                //类型处理
-                if (dto.Type == 0) whereSql = "";
-                else if (dto.Type == 1) //1 由我指派
-                {
-                    whereSql = string.Format(@" And ta.CreateUserId = {0} Or (Select COUNT(1) As PeopleNumber From Pm_TaskRelevanceUser Where IsDel = 0 And ta.Id = TAId And UserId = {0}) > 0", dto.UserId);
-                }
-                else if (dto.Type == 2)// 2 指派给我
-                {
-                    whereSql = string.Format(@" And (Select COUNT(1) As PeopleNumber From Pm_TaskRelevanceUser Where IsDel = 0 And ta.Id = TAId And UserId = {0}) > 0", dto.UserId);
-                }
-                //状态 -1 全部 0 未开始 1 进行中 2 待审核 3 未完成 4 已完成
-                if (dto.Status == -1) //全部
-                {
-                    whereSql += "";
-                }
-                else
-                {
-                    whereSql += string.Format(@" And ta.Status = {0} ", dto.Status);
-                }
+            //类型处理
+            if (dto.Type == 0) whereSql = "";
+            else if (dto.Type == 1) //1 由我指派
+            {
+                whereSql = string.Format(@" And ta.CreateUserId = {0} Or (Select COUNT(1) As PeopleNumber From Pm_TaskRelevanceUser Where IsDel = 0 And ta.Id = TAId And UserId = {0}) > 0", dto.UserId);
+            }
+            else if (dto.Type == 2)// 2 指派给我
+            {
+                whereSql = string.Format(@" And (Select COUNT(1) As PeopleNumber From Pm_TaskRelevanceUser Where IsDel = 0 And ta.Id = TAId And UserId = {0}) > 0", dto.UserId);
+            }
+            //状态 -1 全部 0 未开始 1 进行中 2 待审核 3 未完成 4 已完成
+            if (dto.Status == -1) //全部
+            {
+                whereSql += "";
+            }
+            else
+            {
+                whereSql += string.Format(@" And ta.Status = {0} ", dto.Status);
+            }
 
-                //任务名称
-                if (!string.IsNullOrEmpty(dto.TaskName))
-                {
-                    whereSql += string.Format(@" And ta.TaskName Like '%{0}%' ", dto.TaskName);
-                }
+            //任务名称
+            if (!string.IsNullOrEmpty(dto.TaskName))
+            {
+                whereSql += string.Format(@" And ta.TaskName Like '%{0}%' ", dto.TaskName);
+            }
 
-                #endregion
+            #endregion
 
-                string pageSql = string.Format(@"Select * From(
+            string pageSql = string.Format(@"Select * From(
                                                  Select ROW_NUMBER() OVER(ORDER BY ta.CreateTime Desc) AS RowNumber,
                                                  ta.Id,ta.TaskName,ta.TaskPriority,d.DepName,di.TeamName,ta.Status,
                                                  ta.PredictBeginTime,ta.PredictEndTime,u.CnName As CreateUserName,ta.CreateTime,
@@ -1087,39 +1077,33 @@ namespace OASystem.API.Controllers
                                                  Left Join Sys_Users u On ta.CreateUserId = u.Id
                                                  Where ta.IsDel = 0 {0} ) As temp ", whereSql);
 
-                RefAsync<int> total = 0;//REF和OUT不支持异步,想要真的异步这是最优解
-                var _view = await _taskAllocationRep._sqlSugar.SqlQueryable<TaskListView>(pageSql).ToPageListAsync(dto.PageIndex, dto.PageSize, total);//ToPageAsync
+            RefAsync<int> total = 0;//REF和OUT不支持异步,想要真的异步这是最优解
+            var _view = await _taskAllocationRep._sqlSugar.SqlQueryable<TaskListView>(pageSql).ToPageListAsync(dto.PageIndex, dto.PageSize, total);//ToPageAsync
 
-                List<int> taskIds = new List<int>();
-                taskIds = _view.Select(it => it.Id).ToList();
+            List<int> taskIds = new List<int>();
+            taskIds = _view.Select(it => it.Id).ToList();
 
-                string taskerSql = string.Format(@"Select tau.TAId,tau.Id,tau.UserId,u.CnName As UserName,tau.BeginTime,tau.OverTime,tau.TaskStatus,
+            string taskerSql = string.Format(@"Select tau.TAId,tau.Id,tau.UserId,u.CnName As UserName,tau.BeginTime,tau.OverTime,tau.TaskStatus,
                                                   tau.Cause,tau.Score,tau.Remark As ScoreRemark,tau.CreateUserId As TaskCreateUserId
                                                   From Pm_TaskRelevanceUser tau 
                                                   Left Join Sys_Users u On tau.UserId = u.Id
                                                   Where tau.IsDel = 0");
 
-                var taskerData = _taskAllocationRep._sqlSugar.SqlQueryable<TaskerDetailsView>(taskerSql).Where(it => taskIds.Contains(it.TAId)).ToList();
-                foreach (var item in _view)
-                {
-                    item.TaskerDetails = taskerData.Where(it => it.TAId == item.Id).ToList();
-
-                    ////处理任务总状态 And 任务人状态
-                    //var taskerStatusData = taskerData.Where(it => it.TAId == item.Id && it.TaskCreateUserId != dto.UserId && it.UserId == dto.UserId).FirstOrDefault();
-                    //if (taskerStatusData != null)
-                    //{
-                    //    item.Status = taskerStatusData.TaskStatus;
-                    //}
-                }
-
-
-                return Ok(JsonView(true, "查询成功!", _view, total));
-            }
-            catch (Exception ex)
+            var taskerData = _taskAllocationRep._sqlSugar.SqlQueryable<TaskerDetailsView>(taskerSql).Where(it => taskIds.Contains(it.TAId)).ToList();
+            foreach (var item in _view)
             {
+                item.TaskerDetails = taskerData.Where(it => it.TAId == item.Id).ToList();
 
-                return Ok(JsonView(false, ex.Message));
+                ////处理任务总状态 And 任务人状态
+                //var taskerStatusData = taskerData.Where(it => it.TAId == item.Id && it.TaskCreateUserId != dto.UserId && it.UserId == dto.UserId).FirstOrDefault();
+                //if (taskerStatusData != null)
+                //{
+                //    item.Status = taskerStatusData.TaskStatus;
+                //}
             }
+
+
+            return Ok(JsonView(true, "查询成功!", _view, total));
         }
 
         /// <summary>
@@ -1131,34 +1115,27 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationDetails(TaskAllocationDetailsDto dto)
         {
-            try
-            {
-                #region  参数验证
-                if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
-                if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
-
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+            #region  参数验证
+            if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+            if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
 
-                #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限!"));
-                #endregion
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
-                #endregion
+            if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限!"));
+            #endregion
 
-                var _view = await _taskAllocationRep._Details(dto.PortType, dto.Id);
-                if (_view.Code == 0)
-                {
-                    return Ok(JsonView(true, "查询成功!", _view.Data));
-                }
+            #endregion
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
+            var _view = await _taskAllocationRep._Details(dto.PortType, dto.Id);
+            if (_view.Code == 0)
             {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "查询成功!", _view.Data));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         /// <summary>
@@ -1170,53 +1147,46 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationAddOrEdit(TaskAllocationAddOrEditDto dto)
         {
-            try
-            {
-                #region  参数验证
-                if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
-                if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
+            #region  参数验证
+            if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+            if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
 
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
-                if (dto.Id == 0)
-                {
-                    if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "您没有添加权限!"));
-                }
-                else if (dto.Id > 0)
-                {
-
-                    if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
-                }
+            if (dto.Id == 0)
+            {
+                if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "您没有添加权限!"));
+            }
+            else if (dto.Id > 0)
+            {
 
+                if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
+            }
 
-                #endregion
 
-                #endregion
+            #endregion
 
-                var _view = await _taskAllocationRep._AddOrEdit(dto);
-                if (_view.Code == 0)
-                {
+            #endregion
 
-                    if (dto.Id == 0) //添加提示任务单创建
-                    {
-                        string title = $"[{dto.TaskName}] 任务新建成功!";
-                        string content = $"[{dto.TaskName}] 任务新建成功,请前往任务页面查看详情!";
+            var _view = await _taskAllocationRep._AddOrEdit(dto);
+            if (_view.Code == 0)
+            {
 
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, dto.UserIds);
-                    }
+                if (dto.Id == 0) //添加提示任务单创建
+                {
+                    string title = $"[{dto.TaskName}] 任务新建成功!";
+                    string content = $"[{dto.TaskName}] 任务新建成功,请前往任务页面查看详情!";
 
-                    return Ok(JsonView(true, "操作成功!"));
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, dto.UserIds);
                 }
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!"));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         /// <summary>
@@ -1228,20 +1198,13 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationTaskerDetails(TaskerDetailsDto dto)
         {
-            try
-            {
-                var _view = await _taskAllocationRep._TaskerDetails(dto.Id);
-                if (_view.Code == 0)
-                {
-                    return Ok(JsonView(true, "操作成功!", _view.Data));
-                }
-
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
+            var _view = await _taskAllocationRep._TaskerDetails(dto.Id);
+            if (_view.Code == 0)
             {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!", _view.Data));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         /// <summary>
@@ -1253,48 +1216,41 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationSetStartStatus(TaskerStatusDto dto)
         {
-            try
+            var _view = await _taskAllocationRep._TaskerSetStartStatus(dto.UserId, dto.Id);
+            if (_view.Code == 0)
             {
-                var _view = await _taskAllocationRep._TaskerSetStartStatus(dto.UserId, dto.Id);
-                if (_view.Code == 0)
+                //发送消息
+                var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == dto.Id).First();
+                if (taskData != null)
                 {
-                    //发送消息
-                    var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == dto.Id).First();
-                    if (taskData != null)
+                    var taskUserIds = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.TAId == dto.Id).Select(it => it.UserId).ToList();
+                    if (taskUserIds.Count > 0)
                     {
-                        var taskUserIds = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.TAId == dto.Id).Select(it => it.UserId).ToList();
-                        if (taskUserIds.Count > 0)
-                        {
-                            taskUserIds.Remove(dto.UserId);
-                        }
+                        taskUserIds.Remove(dto.UserId);
+                    }
 
-                        var UserName = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == dto.UserId).Select(it => it.CnName).First();
+                    var UserName = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == dto.UserId).Select(it => it.CnName).First();
 
-                        string title_createUser = $"[{taskData.TaskName}] 进度更新!";
-                        string conten_createUser = $"[{UserName}] 已开始任务,请注意该工作人员任务进度!";
+                    string title_createUser = $"[{taskData.TaskName}] 进度更新!";
+                    string conten_createUser = $"[{UserName}] 已开始任务,请注意该工作人员任务进度!";
 
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title_createUser, conten_createUser, new List<int>() { taskData.CreateUserId }); //创建人发送消息
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title_createUser, conten_createUser, new List<int>() { taskData.CreateUserId }); //创建人发送消息
 
-                        string title = $"[{taskData.TaskName}] 进度更新!";
-                        string content = $"[{UserName}] 已开始任务.若需查看,请前往任务页面查看详情!";
+                    string title = $"[{taskData.TaskName}] 进度更新!";
+                    string content = $"[{UserName}] 已开始任务.若需查看,请前往任务页面查看详情!";
 
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds); //其他人发送消息
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds); //其他人发送消息
 
 
-                        string content1 = $"任务已开始,请在规定时间完成！若需查看,请前往任务页面查看详情!";
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content1, new List<int>() { dto.UserId }); //设置任务人 发送消息
+                    string content1 = $"任务已开始,请在规定时间完成！若需查看,请前往任务页面查看详情!";
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content1, new List<int>() { dto.UserId }); //设置任务人 发送消息
 
-                    }
-
-                    return Ok(JsonView(true, "操作成功!"));
                 }
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!"));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         /// <summary>
@@ -1306,48 +1262,41 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationSetOverStatus(TaskerStatusDto dto)
         {
-            try
+            var _view = await _taskAllocationRep._TaskerSetOverStatus(dto.UserId, dto.Id);
+            if (_view.Code == 0)
             {
-                var _view = await _taskAllocationRep._TaskerSetOverStatus(dto.UserId, dto.Id);
-                if (_view.Code == 0)
+                //发送消息
+                var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == dto.Id).First();
+                if (taskData != null)
                 {
-                    //发送消息
-                    var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == dto.Id).First();
-                    if (taskData != null)
+                    var taskUserIds = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.TAId == dto.Id).Select(it => it.UserId).ToList();
+                    if (taskUserIds.Count > 0)
                     {
-                        var taskUserIds = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.TAId == dto.Id).Select(it => it.UserId).ToList();
-                        if (taskUserIds.Count > 0)
-                        {
-                            taskUserIds.Remove(dto.UserId);
-                        }
-
-                        var UserName = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == dto.UserId).Select(it => it.CnName).First();
+                        taskUserIds.Remove(dto.UserId);
+                    }
 
-                        string title_createUser = $"[{taskData.TaskName}] 进度更新!";
-                        string conten_createUser = $"[{UserName}] 已完成任务,请前往任务页面进行审核操作!";
+                    var UserName = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == dto.UserId).Select(it => it.CnName).First();
 
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title_createUser, conten_createUser, new List<int>() { taskData.CreateUserId }); //创建人发送消息
+                    string title_createUser = $"[{taskData.TaskName}] 进度更新!";
+                    string conten_createUser = $"[{UserName}] 已完成任务,请前往任务页面进行审核操作!";
 
-                        string title = $"[{taskData.TaskName}] 进度更新!";
-                        string content = $"[{UserName}] 已完成任务,请注意在规定时间内完成任务.若需查看,请前往任务页面查看详情!";
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title_createUser, conten_createUser, new List<int>() { taskData.CreateUserId }); //创建人发送消息
 
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds); //其他人发送消息
+                    string title = $"[{taskData.TaskName}] 进度更新!";
+                    string content = $"[{UserName}] 已完成任务,请注意在规定时间内完成任务.若需查看,请前往任务页面查看详情!";
 
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds); //其他人发送消息
 
-                        string content1 = $"任务已完成,等待任务发布人审核！若需查看,请前往任务页面查看详情!";
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content1, new List<int>() { dto.UserId }); //设置任务人 发送消息
 
-                    }
+                    string content1 = $"任务已完成,等待任务发布人审核！若需查看,请前往任务页面查看详情!";
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content1, new List<int>() { dto.UserId }); //设置任务人 发送消息
 
-                    return Ok(JsonView(true, "操作成功!"));
                 }
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!"));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         /// <summary>
@@ -1359,42 +1308,35 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationSetHaveStatus(TaskAllocationStatusDto dto)
         {
-            try
+            var _view = await _taskAllocationRep._TaskSetHaveStatus(dto.SubId);
+            if (_view.Code == 0)
             {
-                var _view = await _taskAllocationRep._TaskSetHaveStatus(dto.SubId);
-                if (_view.Code == 0)
+                //发送消息
+                var taskUserData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.SubId).First();
+                if (taskUserData != null)
                 {
-                    //发送消息
-                    var taskUserData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.SubId).First();
-                    if (taskUserData != null)
-                    {
-                        var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == taskUserData.TAId).First();
+                    var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == taskUserData.TAId).First();
 
-                        if (taskData != null)
-                        {
+                    if (taskData != null)
+                    {
 
-                            var UserName = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == taskData.CreateUserId).Select(it => it.CnName).First();
+                        var UserName = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == taskData.CreateUserId).Select(it => it.CnName).First();
 
-                            string title = $"[{taskData.TaskName}] 进度更新!";
-                            string conten_createUser = $"[{UserName}] 已知晓任务.若需查看,请前往任务页面查看详情!";
+                        string title = $"[{taskData.TaskName}] 进度更新!";
+                        string conten_createUser = $"[{UserName}] 已知晓任务.若需查看,请前往任务页面查看详情!";
 
-                            await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, conten_createUser, new List<int>() { taskData.CreateUserId }); //创建人发送消息
+                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, conten_createUser, new List<int>() { taskData.CreateUserId }); //创建人发送消息
 
-                            string content = $"请注意任务完成时间！若需查看,请前往任务页面查看详情!";
-                            await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, new List<int>() { taskUserData.UserId }); //设置任务人 发送消息
+                        string content = $"请注意任务完成时间！若需查看,请前往任务页面查看详情!";
+                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, new List<int>() { taskUserData.UserId }); //设置任务人 发送消息
 
-                        }
                     }
-
-                    return Ok(JsonView(true, "操作成功!"));
                 }
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!"));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         /// <summary>
@@ -1406,35 +1348,28 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationSetAuditStatus(TaskAllocationStatusDto dto)
         {
-            try
+            var _view = await _taskAllocationRep._TaskSetAuditStatus(dto.SubId);
+            if (_view.Code == 0)
             {
-                var _view = await _taskAllocationRep._TaskSetAuditStatus(dto.SubId);
-                if (_view.Code == 0)
+                //发送消息
+                var taskUserData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.SubId).First();
+                if (taskUserData != null)
                 {
-                    //发送消息
-                    var taskUserData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.SubId).First();
-                    if (taskUserData != null)
-                    {
-                        var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == taskUserData.TAId).First();
+                    var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == taskUserData.TAId).First();
 
-                        if (taskData != null)
-                        {
-                            string title = $"[{taskData.TaskName}] 进度更新!";
-                            string content = $"任务已完成！若需查看,请前往任务页面查看详情!";
-                            await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, new List<int>() { taskUserData.UserId }); //设置任务人 发送消息
+                    if (taskData != null)
+                    {
+                        string title = $"[{taskData.TaskName}] 进度更新!";
+                        string content = $"任务已完成！若需查看,请前往任务页面查看详情!";
+                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, new List<int>() { taskUserData.UserId }); //设置任务人 发送消息
 
-                        }
                     }
-
-                    return Ok(JsonView(true, "操作成功!"));
                 }
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!"));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
 
@@ -1447,35 +1382,28 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationSetUnFinishedStatus(TaskAllocationSetUnFinishedStatusDto dto)
         {
-            try
+            var _view = await _taskAllocationRep._TaskSetUnFinishedStatus(dto.SubId, dto.Cause);
+            if (_view.Code == 0)
             {
-                var _view = await _taskAllocationRep._TaskSetUnFinishedStatus(dto.SubId, dto.Cause);
-                if (_view.Code == 0)
+                //发送消息
+                var taskUserData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.SubId).First();
+                if (taskUserData != null)
                 {
-                    //发送消息
-                    var taskUserData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.SubId).First();
-                    if (taskUserData != null)
-                    {
-                        var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == taskUserData.TAId).First();
+                    var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == taskUserData.TAId).First();
 
-                        if (taskData != null)
-                        {
-                            string title = $"[{taskData.TaskName}] 进度更新!";
-                            string content = $"任务未完成！若需查看,请前往任务页面查看详情!";
-                            await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, new List<int>() { taskUserData.UserId }); //设置任务人 发送消息
+                    if (taskData != null)
+                    {
+                        string title = $"[{taskData.TaskName}] 进度更新!";
+                        string content = $"任务未完成！若需查看,请前往任务页面查看详情!";
+                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, new List<int>() { taskUserData.UserId }); //设置任务人 发送消息
 
-                        }
                     }
-
-                    return Ok(JsonView(true, "操作成功!"));
                 }
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!"));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         ///// <summary>
@@ -1567,50 +1495,43 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationScore(TaskAllocationScoreDto dto)
         {
-            try
-            {
-                #region  参数验证
-                if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
-                if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
+            #region  参数验证
+            if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+            if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
 
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
-                if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
+            if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
 
-                #endregion
+            #endregion
 
-                #endregion
+            #endregion
 
-                var _view = await _taskAllocationRep._TaskScore(dto);
-                if (_view.Code == 0)
+            var _view = await _taskAllocationRep._TaskScore(dto);
+            if (_view.Code == 0)
+            {
+                //发送消息
+                var taskUserData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.SubId).First();
+                if (taskUserData != null)
                 {
-                    //发送消息
-                    var taskUserData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.SubId).First();
-                    if (taskUserData != null)
-                    {
-                        var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == taskUserData.TAId).First();
+                    var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == taskUserData.TAId).First();
 
-                        if (taskData != null)
-                        {
-                            string title = $"[{taskData.TaskName}] 进度更新!";
-                            string content = $"任务评分已完成！若需查看,请前往任务页面查看详情!";
-                            await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, new List<int>() { taskUserData.UserId }); //设置任务人 发送消息
+                    if (taskData != null)
+                    {
+                        string title = $"[{taskData.TaskName}] 进度更新!";
+                        string content = $"任务评分已完成！若需查看,请前往任务页面查看详情!";
+                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, new List<int>() { taskUserData.UserId }); //设置任务人 发送消息
 
-                        }
                     }
-
-                    return Ok(JsonView(true, "操作成功!"));
                 }
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!"));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         /// <summary>
@@ -1622,49 +1543,42 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationTermination(TaskAllocationConfirmCompletionDto dto)
         {
-            try
-            {
-                #region  参数验证
-                if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
-                if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
+            #region  参数验证
+            if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+            if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
 
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
-                if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
+            if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
 
-                #endregion
+            #endregion
 
-                #endregion
+            #endregion
 
-                var _view = await _taskAllocationRep._TaskTermination(dto.Id);
-                if (_view.Code == 0)
+            var _view = await _taskAllocationRep._TaskTermination(dto.Id);
+            if (_view.Code == 0)
+            {
+                //发送消息
+                var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == dto.Id).First();
+                if (taskData != null)
                 {
-                    //发送消息
-                    var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == dto.Id).First();
-                    if (taskData != null)
-                    {
-                        var taskUserIds = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.Id).Select(it => it.UserId).ToList();
-                        taskUserIds.Add(taskData.CreateUserId);
-
+                    var taskUserIds = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.Id).Select(it => it.UserId).ToList();
+                    taskUserIds.Add(taskData.CreateUserId);
 
-                        string title = $"[{taskData.TaskName}] 进度更新!";
-                        string content = $"任务已终止！若需查看,请前往任务页面查看详情!";
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds); //设置任务人 发送消息
 
-                    }
+                    string title = $"[{taskData.TaskName}] 进度更新!";
+                    string content = $"任务已终止！若需查看,请前往任务页面查看详情!";
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds); //设置任务人 发送消息
 
-                    return Ok(JsonView(true, "操作成功!"));
                 }
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!"));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
 
         /// <summary>
@@ -1676,35 +1590,28 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationDel(TaskAllocationConfirmCompletionDto dto)
         {
-            try
-            {
-                #region  参数验证
-                if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
-                if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
+            #region  参数验证
+            if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+            if (dto.PageId < 1) dto.PageId = 172; //任务指派Id
 
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
-                if (pageFunAuthView.DeleteAuth == 0) return Ok(JsonView(false, "您没有删除权限!"));
-
-                #endregion
+            if (pageFunAuthView.DeleteAuth == 0) return Ok(JsonView(false, "您没有删除权限!"));
 
-                #endregion
+            #endregion
 
-                var _view = await _taskAllocationRep._TaskDel(dto.Id);
-                if (_view.Code == 0)
-                {
-                    return Ok(JsonView(true, "操作成功!"));
-                }
+            #endregion
 
-                return Ok(JsonView(false, _view.Msg));
-            }
-            catch (Exception ex)
+            var _view = await _taskAllocationRep._TaskDel(dto.Id);
+            if (_view.Code == 0)
             {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(true, "操作成功!"));
             }
+
+            return Ok(JsonView(false, _view.Msg));
         }
         #endregion
 

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1184,7 +1184,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id {2}
                         }
                         else
                         {
-                            Sys_Users _sysUser = _carDataRep.Query<Sys_Users>(s => s.Id == item.LastedEditorId).First();
+                            var _sysUser = _carDataRep.Query<Sys_Users>(s => s.Id == item.LastedEditorId).First();
                             userDic[item.LastedEditorId] = _sysUser.CnName;
                             item.LastedEditor = _sysUser.CnName;
                         }
@@ -1210,7 +1210,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                     Res_MemoView _result = _carDataRep._sqlSugar.SqlQueryable<Res_MemoView>(sqlSingle).First();
                     if (_result != null)
                     {
-                        Sys_Users _sysUser = _carDataRep.Query<Sys_Users>(s => s.Id == _result.LastedEditorId).First();
+                        var _sysUser = _carDataRep.Query<Sys_Users>(s => s.Id == _result.LastedEditorId).First();
                         _result.LastedEditor = _sysUser.CnName;
                         _result.MarkDownContent = new IOOperatorHelper().Read(_result.MDFilePath);
                         return Ok(JsonView(_result));
@@ -1243,7 +1243,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             {
                 return Ok(JsonView(false, "操作人失效"));
             }
-            Sys_Users _sysUser = _resItemInfoRep.Query<Sys_Users>(s => s.Id == _dto.SysUserId).First();
+            var _sysUser = _resItemInfoRep.Query<Sys_Users>(s => s.Id == _dto.SysUserId).First();
             if (_sysUser == null)
             {
                 return Ok(JsonView(false, "操作人失效02"));
@@ -1370,69 +1370,64 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryIOAInitData(QueryIOAInitDataDto dto)
         {
-            try
-            {
-                #region 参数验证
+            #region 参数验证
 
-                if (dto.PortType < 1) return Ok(JsonView(false, "请传入有效的PortType参数！"));
+            if (dto.PortType < 1) return Ok(JsonView(false, "请传入有效的PortType参数！"));
 
-                #endregion
-
-                var ExcludedKeyStr = new string[] { "快递费" };
-                var ClientKeyStr = new string[] { "邀请函翻译" };
+            #endregion
 
-                List<Grp_DelegationInfo> _DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(it => it.IsDel == 0).OrderByDescending(it => it.JietuanTime).ToList();
-                List<Res_InvitationOfficialActivityData> _ioaDatas = _sqlSugar.Queryable<Res_InvitationOfficialActivityData>()
-                    .Where(it => it.IsDel == 0)
-                    .Select(x => new Res_InvitationOfficialActivityData
-                    {
-                        Country = x.Country,
-                        UnitName = x.UnitName,
-                        Contact = x.Contact,
-                        Field = x.Field,
-                    })
-                    .ToList();
+            var ExcludedKeyStr = new string[] { "快递费" };
+            var ClientKeyStr = new string[] { "邀请函翻译" };
 
-                foreach (var item in ExcludedKeyStr)
+            List<Grp_DelegationInfo> _DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(it => it.IsDel == 0).OrderByDescending(it => it.JietuanTime).ToList();
+            List<Res_InvitationOfficialActivityData> _ioaDatas = _sqlSugar.Queryable<Res_InvitationOfficialActivityData>()
+                .Where(it => it.IsDel == 0)
+                .Select(x => new Res_InvitationOfficialActivityData
                 {
-                    _ioaDatas = _ioaDatas.Where(x => string.IsNullOrWhiteSpace(x.UnitName) || !x.UnitName.Contains(item)).ToList();
-                }
+                    Country = x.Country,
+                    UnitName = x.UnitName,
+                    Contact = x.Contact,
+                    Field = x.Field,
+                })
+                .ToList();
 
-                foreach (var item in ClientKeyStr)
-                {
-                    _ioaDatas = _ioaDatas.Where(x => string.IsNullOrWhiteSpace(x.Contact) || !x.Contact.Contains(item)).ToList();
-                }
+            foreach (var item in _ioaDatas)
+            {
+                EncryptionProcessor.DecryptProperties(item);
+            }
 
-                foreach (var item in _ioaDatas)
-                {
-                    EncryptionProcessor.DecryptProperties(item);
-                }
-                
-                List<Sys_Users> _Users = _sqlSugar.Queryable<Sys_Users>().Where(it => it.IsDel == 0).ToList();
+            foreach (var item in ExcludedKeyStr)
+            {
+                _ioaDatas = _ioaDatas.Where(x => string.IsNullOrWhiteSpace(x.UnitName) || !x.UnitName.Contains(item)).ToList();
+            }
 
-                var _countryData = _ioaDatas.Select(it => it.Country).Distinct().ToList(); _countryData.Remove("");
-                var _inviterData = _ioaDatas.Select(it => it.UnitName).Distinct().ToList(); _inviterData.Remove("");
-                var _contactData = _ioaDatas.Select(it => it.Contact).Distinct().ToList(); _contactData.Remove("");
-                var _domainData = _ioaDatas.Select(it => it.Field).Distinct().ToList(); _domainData.Remove("");
-                var _groupNameData = _DelegationInfos.Select(it => new { it.Id, it.TeamName }).ToList();
-                var _userNameData = _Users.Select(it => new { it.Id, it.CnName }).ToList();
+            foreach (var item in ClientKeyStr)
+            {
+                _ioaDatas = _ioaDatas.Where(x => string.IsNullOrWhiteSpace(x.Contact) || !x.Contact.Contains(item)).ToList();
+            }
 
-                var _data = new
-                {
-                    CountryData = _countryData,
-                    InviterData = _inviterData,
-                    DomainData = _domainData,
-                    ContactData = _contactData,
-                    GroupNameData = _groupNameData,
-                    UserNameData = _userNameData,
-                };
 
-                return Ok(JsonView(true, $"查询成功!", _data));
-            }
-            catch (Exception ex)
+
+            List<Sys_Users> _Users = _sqlSugar.Queryable<Sys_Users>().Where(it => it.IsDel == 0).ToList();
+
+            var _countryData = _ioaDatas.Select(it => it.Country).Distinct().ToList(); _countryData.Remove("");
+            var _inviterData = _ioaDatas.Select(it => it.UnitName).Distinct().ToList(); _inviterData.Remove("");
+            var _contactData = _ioaDatas.Select(it => it.Contact).Distinct().ToList(); _contactData.Remove("");
+            var _domainData = _ioaDatas.Select(it => it.Field).Distinct().ToList(); _domainData.Remove("");
+            var _groupNameData = _DelegationInfos.Select(it => new { it.Id, it.TeamName }).ToList();
+            var _userNameData = _Users.Select(it => new { it.Id, it.CnName }).ToList();
+
+            var _data = new
             {
-                return Ok(JsonView(false, ex.Message));
-            }
+                CountryData = _countryData,
+                InviterData = _inviterData,
+                DomainData = _domainData,
+                ContactData = _contactData,
+                GroupNameData = _groupNameData,
+                UserNameData = _userNameData,
+            };
+
+            return Ok(JsonView(true, $"查询成功!", _data));
         }
 
         /// <summary>

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2193,9 +2193,10 @@ ORDER BY
                                                   .Select(it => it.JietuanOperator)
                                                   .ToList();
 
-            var userData = _sqlSugar.Queryable<Sys_Users>().Where(it => it.IsDel == 0 && (pickGroupUserIds.Contains(it.Id) || it.Id == 21))
-                                   .Select(it => new { id = it.Id, companyId = it.CompanyId, name = it.CnName })
-                                   .ToList();
+            var userData = _sqlSugar.Queryable<Sys_Users>()
+                                    .Where(it => it.IsDel == 0 && (pickGroupUserIds.Contains(it.Id) || it.Id == 21))
+                                    .Select(it => new { id = it.Id, companyId = it.CompanyId, name = it.CnName })
+                                    .ToList();
 
             companyData.Insert(0, new { id = -1, name = "全部" });
             userData.Insert(0, new { id = -1, companyId = -1, name = "全部" });
@@ -4362,7 +4363,6 @@ WHERE
             return Ok(JsonView(true, "操作成功!", view));
         }
 
-
         /// <summary>
         ///  团组数据统计
         ///  团组数量
@@ -5195,7 +5195,6 @@ WHERE
             return Ok(JsonView(briefData, total));
         }
 
-
         /// <summary>
         ///  团组数据统计
         ///  当前时间团组所在城市   
@@ -5211,9 +5210,25 @@ WHERE
             var nowBool = DateTime.TryParse(nowLable, out DateTime now);
             if (!nowBool) return Ok(JsonView(false, $"请传入有效的当前时间(2024-11-27)!"));
 
-            var data = await _sqlSugar.Queryable<Grp_AirTicketReservations>()
+            #region 舱位类型
+            //457 头等舱
+            //458 公务舱
+            //459 超经舱
+            //460 经济舱
+            //461 退票
+            //565 其他
+            //574 长段公务舱
+            //575 短途经济舱
+            //1023    行程单打印费
+            //1024    选座费
+
+            var classTypes = new int[] { 457, 458, 459, 460, 574, 575 };
+
+            #endregion
+
+            var throughCities = await _sqlSugar.Queryable<Grp_AirTicketReservations>()
                 .LeftJoin<Grp_DelegationInfo>((atr, di) => atr.DIId == di.Id)
-                .Where((atr, di) => atr.IsDel == 0 && atr.FlightsDate.Trim().Equals(nowLable))
+                .Where((atr, di) => atr.IsDel == 0 && atr.FlightsDate.Trim().Equals(nowLable) && classTypes.Contains(atr.CType))
                 .Select((atr, di) => new
                 {
                     atr.DIId,
@@ -5221,10 +5236,10 @@ WHERE
                     atr.FlightsDate,
                     atr.FlightsCode,
                     atr.FlightsCity
-
                 })
                 .ToListAsync();
 
+            var cities = await _sqlSugar.Queryable<Res_ThreeCode>().Where(x => x.IsDel == 0).ToListAsync();
 
 
             return Ok(JsonView(false));

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -568,58 +568,50 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> getCompanyList(DtoBase dto)
         {
-            try
+            if (dto.PortType == 1)
             {
-                if (dto.PortType == 1)
+                var CompanyDataResult = _CompanyRepository.GetCompanyData();
+                if (CompanyDataResult.Code != 0)
+                {
+                    return Ok(JsonView(CompanyDataResult.Msg));
+                }
+                List<CompanyView> companyListView = _mapper.Map<List<CompanyView>>(CompanyDataResult.Data);
+                for (int i = 0; i < companyListView.Count; i++)
                 {
-                    var CompanyDataResult = _CompanyRepository.GetCompanyData();
-                    if (CompanyDataResult.Code != 0)
+                    if (companyListView[i].ParentCompanyId != 0)
                     {
-                        return Ok(JsonView(CompanyDataResult.Msg));
+                        companyListView[i].ParentCompanyName = companyListView.Find(x => x.Id == companyListView[i].ParentCompanyId).CompanyName;
                     }
-                    List<CompanyView> companyListView = _mapper.Map<List<CompanyView>>(CompanyDataResult.Data);
-                    for (int i = 0; i < companyListView.Count; i++)
+                    if (companyListView[i].ContactUserId != 0)
                     {
-                        if (companyListView[i].ParentCompanyId != 0)
+                        var user = _userRep.QueryDto<Sys_Users, UserInfoWebView>(x => x.Id == companyListView[i].ContactUserId).ToList();
+                        if (user.Count != 0)
                         {
-                            companyListView[i].ParentCompanyName = companyListView.Find(x => x.Id == companyListView[i].ParentCompanyId).CompanyName;
-                        }
-                        if (companyListView[i].ContactUserId != 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;
-                            }
-
+                            companyListView[i].ContactUserName = user[0].CnName;
                         }
 
                     }
-                    return Ok(JsonView(true, "查询成功！", companyListView));
-                }
-                else if (dto.PortType == 2)
-                {
-                    var CompanyDataResult = _CompanyRepository.GetCompanyData();
-                    if (CompanyDataResult.Code != 0)
-                    {
-                        return Ok(JsonView(CompanyDataResult.Msg));
-                    }
 
-                    return Ok(JsonView(true, "查询成功！", CompanyDataResult.Data));
                 }
-                else if (dto.PortType == 3)
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
-                }
-                else
+                return Ok(JsonView(true, "查询成功！", companyListView));
+            }
+            else if (dto.PortType == 2)
+            {
+                var CompanyDataResult = _CompanyRepository.GetCompanyData();
+                if (CompanyDataResult.Code != 0)
                 {
-                    return Ok(JsonView(false, "暂无数据！"));
+                    return Ok(JsonView(CompanyDataResult.Msg));
                 }
+
+                return Ok(JsonView(true, "查询成功！", CompanyDataResult.Data));
             }
-            catch (Exception ex)
+            else if (dto.PortType == 3)
             {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                return Ok(JsonView(false, "暂无数据！"));
+            }
+            else
+            {
+                return Ok(JsonView(false, "暂无数据！"));
             }
         }
 
@@ -632,32 +624,24 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> AddCompany(AddCompanyDto dto)
         {
-            try
+            if (string.IsNullOrWhiteSpace(dto.CompanyName) || dto.CreateUserId == 0 || string.IsNullOrWhiteSpace(dto.CompanyCode))
             {
-                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(false, "请检查信息是否输入完整！"));
+            }
+            else if (string.IsNullOrWhiteSpace(dto.Tel))
+            {
+                return Ok(JsonView(false, "请检查联系方式是否输入正确！"));
+            }
+            else
+            {
+                Sys_Company _Company = _mapper.Map<Sys_Company>(dto);
+                Result data = await _syscomRep.AddCompany(_Company);
+                if (data.Code != 0)
                 {
-                    Sys_Company _Company = _mapper.Map<Sys_Company>(dto);
-                    Result data = await _syscomRep.AddCompany(_Company);
-                    if (data.Code != 0)
-                    {
-                        return Ok(JsonView(false, "添加失败！"));
+                    return Ok(JsonView(false, "添加失败！"));
 
-                    }
-                    return Ok(JsonView(true, "添加成功"));
                 }
-            }
-            catch (Exception)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                return Ok(JsonView(true, "添加成功"));
             }
 
 
@@ -672,36 +656,28 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         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, "请检查信息是否输入完整！"));
-                }
-                else if (string.IsNullOrWhiteSpace(dto.Tel))
-                {
-                    return Ok(JsonView(false, "请检查联系方式是否输入正确！"));
-                }
-                else
-                {
-                    bool res = await _syscomRep.UpdateAsync(a => a.Id == dto.Id, a => new Sys_Company
-                    {
-                        CompanyName = dto.CompanyName,
-                        CompanyCode = dto.CompanyCode,
-                        Address = dto.Address,
-                        ParentCompanyId = dto.ParentCompanyId,
-                        Tel = dto.Tel,
-                        ContactUserId = dto.ContactUserId,
-                        Remark = dto.Remark,
-                    });
-                    if (!res) { return Ok(JsonView(false, "修改失败")); }
-                    return Ok(JsonView(true, "修改成功！"));
-                }
+                return Ok(JsonView(false, "请检查信息是否输入完整！"));
             }
-            catch (Exception)
+            else if (string.IsNullOrWhiteSpace(dto.Tel))
             {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                return Ok(JsonView(false, "请检查联系方式是否输入正确！"));
+            }
+            else
+            {
+                bool res = await _syscomRep.UpdateAsync(a => a.Id == dto.Id, a => new Sys_Company
+                {
+                    CompanyName = dto.CompanyName,
+                    CompanyCode = dto.CompanyCode,
+                    Address = dto.Address,
+                    ParentCompanyId = dto.ParentCompanyId,
+                    Tel = dto.Tel,
+                    ContactUserId = dto.ContactUserId,
+                    Remark = dto.Remark,
+                });
+                if (!res) { return Ok(JsonView(false, "修改失败")); }
+                return Ok(JsonView(true, "修改成功！"));
             }
 
 
@@ -716,20 +692,9 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> DelCompany(DelCompanyDto dto)
         {
-            try
-            {
-                bool res = await _syscomRep.SoftDeleteAsync<Sys_Company>(dto.Id.ToString());
-                if (!res) { return Ok(JsonView(false, "删除失败")); }
-                return Ok(JsonView(true, "删除成功"));
-            }
-            catch (Exception)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
-            }
-
-
-
+            bool res = await _syscomRep.SoftDeleteAsync<Sys_Company>(dto.Id.ToString());
+            if (!res) { return Ok(JsonView(false, "删除失败")); }
+            return Ok(JsonView(true, "删除成功"));
         }
         #endregion
 
@@ -1077,6 +1042,25 @@ namespace OASystem.API.Controllers
 
         #region 用户操作
 
+        ///// <summary>
+        ///// 用户表指定字段加密
+        ///// </summary>
+        ///// <param name="dto"></param>
+        ///// <returns></returns>
+        //[HttpPost]
+        //[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        //public async Task<IActionResult> UserBatchEncryption()
+        //{
+        //    var items = await _sqlSugar.Queryable<Sys_Users>().Select(x => new Sys_Users() { Id = x.Id, Phone = x.Phone, UrgentPhone = x.UrgentPhone, IDCard = x.IDCard }).ToListAsync();
+
+        //    foreach (var item in items) EncryptionProcessor.EncryptProperties(item);
+
+        //    var updItems = await _sqlSugar.Updateable(items).UpdateColumns(x => new { x.Phone, x.UrgentPhone, x.IDCard }).ExecuteCommandAsync();
+
+        //    return Ok(JsonView(updItems));
+        //}
+
+
         /// <summary>
         /// 查询所有员工名称
         /// </summary>
@@ -1086,21 +1070,13 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetUserNameList(DtoBase dto)
         {
-            try
+            var result = _userRep.GetUserNameList(dto.PortType);
+            if (result.Result.Code != 0)
             {
-                var result = _userRep.GetUserNameList(dto.PortType);
-                if (result.Result.Code != 0)
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
+                return Ok(JsonView(false, "暂无数据！"));
 
-                }
-                return Ok(JsonView(true, "查询成功！", result.Result.Data));
-            }
-            catch (Exception)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
             }
+            return Ok(JsonView(true, "查询成功！", result.Result.Data));
         }
 
         /// <summary>
@@ -1112,21 +1088,13 @@ namespace OASystem.API.Controllers
         [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)
             {
-                var result = _userRep.GetUserList(dto.PortType, string.Empty);
-                if (result.Result.Code != 0)
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
+                return Ok(JsonView(false, "暂无数据！"));
 
-                }
-                return Ok(JsonView(true, "查询成功！", result.Result.Data));
-            }
-            catch (Exception)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
             }
+            return Ok(JsonView(true, "查询成功！", result.Result.Data));
         }
 
         /// <summary>
@@ -1138,36 +1106,30 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryUserList(UserDto dto)
         {
-            try
+            string sqlWhere = string.Format(" Where su.IsDel = 0 ");
+            if (dto.CompanyId != 0)
             {
-                string sqlWhere = string.Format(" Where su.IsDel = 0 ");
-                if (dto.CompanyId != 0)
-                {
-                    sqlWhere += string.Format(@" And su.CompanyId={0}", dto.CompanyId);
-                }
-                if (dto.DepId != 0)
-                {
-                    sqlWhere += string.Format(@" And su.DepId={0}", dto.DepId);
-                }
-                if (dto.JobPostId != 0)
-                {
-                    sqlWhere += string.Format(@" And su.JobPostId={0}", dto.JobPostId);
-                }
-
-                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));
+                sqlWhere += string.Format(@" And su.CompanyId={0}", dto.CompanyId);
             }
-            catch (Exception)
+            if (dto.DepId != 0)
             {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                sqlWhere += string.Format(@" And su.DepId={0}", dto.DepId);
+            }
+            if (dto.JobPostId != 0)
+            {
+                sqlWhere += string.Format(@" And su.JobPostId={0}", dto.JobPostId);
+            }
+
+            List<UserInfo> _userList = await _userRep.QueryUser(sqlWhere);
+            if (_userList.Count == 0)
+            {
+                return Ok(JsonView(400, "暂无数据！", new List<String>()));
             }
 
+            foreach (var item in _userList) EncryptionProcessor.DecryptProperties(item);
+
+            List<UserInfoWebView> userList = _mapper.Map<List<UserInfoWebView>>(_userList);
+            return Ok(JsonView(true, "查询成功！", userList));
         }
 
         /// <summary>
@@ -1178,48 +1140,51 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> UserInfo(UserInfoDto dto)
         {
-
             if (dto.Id < 1) return Ok(JsonView(false, "请选择有效的userId!"));
             if (dto.PortType < 1 || dto.PortType > 3) return Ok(JsonView(false, MsgTips.Port));
 
             var _view = await _sqlSugar.Queryable<Sys_Users>()
                                        .Where(x => x.IsDel == 0 && x.Id == dto.Id)
-                                       .Select(x => new
-                                       {
-                                           x.Id,
-                                           x.CnName,
-                                           x.EnName,
-                                           x.Number,
-                                           x.CompanyId,
-                                           x.DepId,
-                                           x.JobPostId,
-                                           x.Password,
-                                           x.Sex,
-                                           x.Ext,
-                                           x.Phone,
-                                           x.UrgentPhone,
-                                           x.Email,
-                                           x.Address,
-                                           x.Edate,
-                                           //x.Seniority,
-                                           x.Birthday,
-                                           x.IDCard,
-                                           x.StartWorkDate,
-                                           x.GraduateInstitutions,
-                                           x.Professional,
-                                           x.Education,
-                                           x.TheOrAdultEducation,
-                                           x.MaritalStatus,
-                                           x.HomeAddress,
-                                           x.UsePeriod,
-                                           x.WorkExperience,
-                                           x.Certificate,
-                                           //x.QiyeChatUserId,
-                                           x.Remark
-                                       }).FirstAsync();
-            return Ok(JsonView(true, "操作成功!", _view));
-        }
+                                       .FirstAsync();
+
+            //解密
+            EncryptionProcessor.DecryptProperties(_view);
+
+            var data = new {
+                _view.Id,
+                _view.CnName,
+                _view.EnName,
+                _view.Number,
+                _view.CompanyId,
+                _view.DepId,
+                _view.JobPostId,
+                _view.Password,
+                _view.Sex,
+                _view.Ext,
+                _view.Phone,
+                _view.UrgentPhone,
+                _view.Email,
+                _view.Address,
+                _view.Edate,
+                //_view.Seniority,
+                _view.Birthday,
+                _view.IDCard,
+                _view.StartWorkDate,
+                _view.GraduateInstitutions,
+                _view.Professional,
+                _view.Education,
+                _view.TheOrAdultEducation,
+                _view.MaritalStatus,
+                _view.HomeAddress,
+                _view.UsePeriod,
+                _view.WorkExperience,
+                _view.Certificate,
+                //_view.QiyeChatUserId,
+                _view.Remark
+            };
 
+            return Ok(JsonView(true, "操作成功!", data));
+        }
 
         /// <summary>
         /// 员工信息 All信息修改
@@ -1258,6 +1223,8 @@ namespace OASystem.API.Controllers
 
             if (!userIds.Contains(_dto.CurrUserId)) return Ok(JsonView(false, "暂无修改权限！"));
 
+            //加密
+            EncryptionProcessor.EncryptProperties(userInfo);
 
             var res = await _sqlSugar.Updateable(userInfo)
                                      .IgnoreColumns(x => new
@@ -1274,12 +1241,12 @@ namespace OASystem.API.Controllers
                                      })
                                      .Where(x => x.Id == _dto.Id)
                                      .ExecuteCommandAsync();
+
             if (res > 0) return Ok(JsonView(true, "操作成功!"));
 
             return Ok(JsonView(false, "操作失败!"));
         }
 
-
         /// <summary>
         /// 修改用户信息（上级修改/分配 公司、部门、岗位、工号等信息）
         /// </summary>
@@ -1289,12 +1256,10 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> EditUser(EditUserDto dto)
         {
-            try
-            {
-                if (dto.CurrUserId < 1) return Ok(JsonView(false, "暂无修改权限！"));
+            if(dto.CurrUserId < 1) return Ok(JsonView(false, "暂无修改权限！"));
 
-                //修改权限验证 指定人员 信息部门(4)和人事部刘一茹( 230)、赖红燕(309)
-                List<int> userIds = new List<int>() {
+            //修改权限验证 指定人员 信息部门(4)和人事部刘一茹( 230)、赖红燕(309)
+            var userIds = new List<int>() {
                         4   ,//管理员
                         5   ,//杨俊霄
                         117 ,//人事审核号
@@ -1306,29 +1271,24 @@ namespace OASystem.API.Controllers
                         309 ,//赖红燕
                      };
 
-                if (!userIds.Contains(dto.CurrUserId)) return Ok(JsonView(false, "暂无修改权限！"));
+            if (!userIds.Contains(dto.CurrUserId)) return Ok(JsonView(false, "暂无修改权限！"));
 
-                bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users
-                {
-                    Number = dto.Number,
-                    CompanyId = dto.CompanyId,
-                    DepId = dto.DepId,
-                    JobPostId = dto.JobPostId,
-                    Ext = dto.Ext,
-                    UsePeriod = dto.UsePeriod,
-                    //HrAudit = dto.HrAudit
-                });
-                if (!res)
-                {
-                    return Ok(JsonView(false, "修改失败！"));
-                }
-
-                return Ok(JsonView(true, "修改成功！"));
-            }
-            catch (Exception)
+            bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users
             {
-                return Ok(JsonView(false, "程序错误！"));
+                Number = dto.Number,
+                CompanyId = dto.CompanyId,
+                DepId = dto.DepId,
+                JobPostId = dto.JobPostId,
+                Ext = dto.Ext,
+                UsePeriod = dto.UsePeriod,
+                //HrAudit = dto.HrAudit
+            });
+            if (!res)
+            {
+                return Ok(JsonView(false, "修改失败！"));
             }
+
+            return Ok(JsonView(true, "修改成功！"));
         }
 
         /// <summary>
@@ -1340,56 +1300,62 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> EditMyUser(EditMyUserDto dto)
         {
-            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))
             {
-                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))
-                {
-                    return Ok(JsonView(false, "请完善你的个人信息！"));
-                }
-                else if (string.IsNullOrWhiteSpace(dto.GraduateInstitutions) || string.IsNullOrWhiteSpace(dto.Professional) || dto.Education == 0 || string.IsNullOrWhiteSpace(dto.GraduateInstitutions))
-                {
-                    return Ok(JsonView(false, "请完善你的学历信息！"));
-                }
-                else if (string.IsNullOrWhiteSpace(dto.Phone) || string.IsNullOrWhiteSpace(dto.UrgentPhone) || string.IsNullOrWhiteSpace(dto.Email))
+                return Ok(JsonView(false, "请完善你的个人信息！"));
+            }
+            else if (string.IsNullOrWhiteSpace(dto.GraduateInstitutions) || 
+                string.IsNullOrWhiteSpace(dto.Professional) || 
+                dto.Education == 0 || 
+                string.IsNullOrWhiteSpace(dto.GraduateInstitutions))
+            {
+                return Ok(JsonView(false, "请完善你的学历信息！"));
+            }
+            else if (string.IsNullOrWhiteSpace(dto.Phone) || 
+                string.IsNullOrWhiteSpace(dto.UrgentPhone) || 
+                string.IsNullOrWhiteSpace(dto.Email))
+            {
+                return Ok(JsonView(false, "请检查联系方式、紧急联系人及邮箱输写是否正确!"));
+            }
+            else
+            {
+                //指定字段加密
+                var phone = AesEncryptionHelper.Encrypt(dto.Phone);
+                var urgentPhone = AesEncryptionHelper.Encrypt(dto.UrgentPhone);
+                var IDCard = AesEncryptionHelper.Encrypt(dto.IDCard);
+
+                bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users
                 {
-                    return Ok(JsonView(false, "请检查联系方式、紧急联系人及邮箱输写是否正确!"));
-                }
-                else
+                    CnName = dto.CnName,
+                    EnName = dto.EnName,
+                    Sex = dto.Sex,
+                    Phone = phone,
+                    UrgentPhone = urgentPhone,
+                    Email = dto.Email,
+                    Address = dto.Address,
+                    Edate = dto.Edate,
+                    Birthday = dto.Birthday,
+                    IDCard = IDCard,
+                    GraduateInstitutions = dto.GraduateInstitutions,
+                    Professional = dto.Professional,
+                    Education = dto.Education,
+                    TheOrAdultEducation = dto.TheOrAdultEducation,
+                    MaritalStatus = dto.MaritalStatus,
+                    HomeAddress = dto.HomeAddress,
+                    WorkExperience = dto.WorkExperience,
+                    Certificate = dto.Certificate
+                });
+                if (!res)
                 {
-                    bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users
-                    {
-                        CnName = dto.CnName,
-                        EnName = dto.EnName,
-                        Sex = dto.Sex,
-                        Phone = dto.Phone,
-                        UrgentPhone = dto.UrgentPhone,
-                        Email = dto.Email,
-                        Address = dto.Address,
-                        Edate = dto.Edate,
-                        Birthday = dto.Birthday,
-                        IDCard = dto.IDCard,
-                        GraduateInstitutions = dto.GraduateInstitutions,
-                        Professional = dto.Professional,
-                        Education = dto.Education,
-                        TheOrAdultEducation = dto.TheOrAdultEducation,
-                        MaritalStatus = dto.MaritalStatus,
-                        HomeAddress = dto.HomeAddress,
-                        WorkExperience = dto.WorkExperience,
-                        Certificate = dto.Certificate
-                    });
-                    if (!res)
-                    {
-                        return Ok(JsonView(false, "修改失败！"));
-                    }
-                    return Ok(JsonView(true, "修改成功！"));
+                    return Ok(JsonView(false, "修改失败！"));
                 }
-
-            }
-            catch (Exception)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                return Ok(JsonView(true, "修改成功！"));
             }
         }
 
@@ -1403,40 +1369,32 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostUserDelById(UserDelDto dto)
         {
-            try
+            if (dto == null)
             {
-                if (dto == null)
-                {
-                    return Ok(JsonView(false, "参数不能为空！"));
-                }
-                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)
-                    {
-                        return Ok(JsonView(false, "该人员为公司最后一位，不可删除！"));
-                    }
-                }
-
-                bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users
-                {
-                    IsDel = 1,
-                    DeleteUserId = dto.OperateUserId,
-                    DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                    Rdate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))
-                });
-                if (!res)
+                return Ok(JsonView(false, "参数不能为空！"));
+            }
+            var _Users = _sqlSugar.Queryable<Sys_Users>().First(a => a.IsDel == 0 && a.Id == dto.Id);
+            if (_Users != null)
+            {
+                var 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, "操作失败！"));
+                    return Ok(JsonView(false, "该人员为公司最后一位，不可删除！"));
                 }
-                return Ok(JsonView(true, "操作成功！"));
-
             }
-            catch (Exception)
+
+            bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users
             {
-                return Ok(JsonView(false, "程序错误！"));
+                IsDel = 1,
+                DeleteUserId = dto.OperateUserId,
+                DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                Rdate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))
+            });
+            if (!res)
+            {
+                return Ok(JsonView(false, "操作失败！"));
             }
+            return Ok(JsonView(true, "操作成功！"));
         }
 
         /// <summary>
@@ -1453,12 +1411,7 @@ namespace OASystem.API.Controllers
             if (dto.Id < 1) return Ok(JsonView(false, "请传入有效的Id参数！"));
             if (dto.IsAudit < 1 || dto.IsAudit > 2) return Ok(JsonView(false, "请传入有效的IsAudit参数！1：通过 2拒绝"));
 
-            bool res = await _userRep.UpdateAsync<Sys_Users>(a =>
-                                      a.Id == dto.Id,
-                                      a => new Sys_Users
-                                      {
-                                          HrAudit = dto.IsAudit
-                                      });
+            bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users { HrAudit = dto.IsAudit });
             if (res)
             {
                 //审核成功添加员工基础页面权限
@@ -1494,25 +1447,16 @@ namespace OASystem.API.Controllers
             string sql = $@"SELECT  * FROM  Sys_Users su WHERE su.JobPostId  in (SELECT  id FROM  Sys_JobPost sj  WHERE  sj.IsDel  = 0 AND  sj.DepId  = {dto.DepartId} )
                             AND  su.IsDel  = 0 ";
 
-            try
+            var result = _sqlSugar.SqlQueryable<Sys_Users>(sql).Select(x => new
             {
-                var result = _sqlSugar.SqlQueryable<Sys_Users>(sql).Select(x => new
-                {
-                    x.Id,
-                    x.CnName,
-                    x.EnName
-                }).ToList();
+                x.Id,
+                x.CnName,
+                x.EnName
+            }).ToList();
 
-                jw.Data = result;
-                jw.Code = 200;
-                jw.Msg = "获取成功！";
-            }
-            catch (Exception ex)
-            {
-                jw.Data = System.Array.Empty<string>();
-                jw.Code = 400;
-                jw.Msg = "获取失败！" + ex.Message;
-            }
+            jw.Data = result;
+            jw.Code = 200;
+            jw.Msg = "获取成功！";
 
             return Ok(jw);
         }
@@ -2141,20 +2085,12 @@ And u.UId = {0} And u.FId = 1 ", dto.UserId);
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PageFunInit()
         {
-            try
+            var PageFunInit = _PageFunctionPermissionRepository.QueryDto<Sys_PageFunctionPermission, PageFunctionPermissionView>().ToList();
+            if (PageFunInit == null)
             {
-                var PageFunInit = _PageFunctionPermissionRepository.QueryDto<Sys_PageFunctionPermission, PageFunctionPermissionView>().ToList();
-                if (PageFunInit == null)
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
-                }
-                return Ok(JsonView(true, "查询成功！", PageFunInit));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                return Ok(JsonView(false, "暂无数据！"));
             }
+            return Ok(JsonView(true, "查询成功！", PageFunInit));
         }
 
         /// <summary>
@@ -2165,20 +2101,12 @@ And u.UId = {0} And u.FId = 1 ", dto.UserId);
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> OperationFun(OperationFunInitDta dto)
         {
-            try
-            {
-                Result result = await _PageFunctionPermissionRepository.OperationFunInit(dto);
-                if (result.Code != 0)
-                {
-                    return Ok(JsonView(false, result.Msg));
-                }
-                return Ok(JsonView(true, result.Msg));
-            }
-            catch (Exception ex)
+            Result result = await _PageFunctionPermissionRepository.OperationFunInit(dto);
+            if (result.Code != 0)
             {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                return Ok(JsonView(false, result.Msg));
             }
+            return Ok(JsonView(true, result.Msg));
         }
 
         /// <summary>
@@ -2190,19 +2118,12 @@ And u.UId = {0} And u.FId = 1 ", dto.UserId);
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> DelFun(DelFunInitDta dto)
         {
-            try
+            var res = await _PageFunctionPermissionRepository.SoftDeleteByIdAsync<Sys_PageFunctionPermission>(dto.Id.ToString(), dto.DeleteUserId);
+            if (!res)
             {
-                var res = await _PageFunctionPermissionRepository.SoftDeleteByIdAsync<Sys_PageFunctionPermission>(dto.Id.ToString(), dto.DeleteUserId);
-                if (!res)
-                {
-                    return Ok(JsonView(false, "删除失败"));
-                }
-                return Ok(JsonView(true, "删除成功！"));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, "程序错误！"));
+                return Ok(JsonView(false, "删除失败"));
             }
+            return Ok(JsonView(true, "删除成功！"));
         }
 
         #endregion

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

@@ -57,12 +57,14 @@ namespace OASystem.Domain.Entities.System
         /// <summary>
         /// 手机号
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [Encrypted]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(100)")]
         public string Phone { get; set; }
         /// <summary>
         /// 紧急联系人 手机号
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [Encrypted]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(100)")]
         public string UrgentPhone { get; set; }
         /// <summary>
         /// 邮箱
@@ -98,7 +100,7 @@ namespace OASystem.Domain.Entities.System
         /// 身份证号码
         /// </summary>
         [Encrypted]
-        [SugarColumn(IsNullable = true, ColumnDataType ="varchar(20)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(100)")]
         public string IDCard { get; set; }
         /// <summary>
         /// 开始工作时

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

@@ -1,4 +1,5 @@
-using OASystem.Domain.Entities.System;
+using OASystem.Domain.Attributes;
+using OASystem.Domain.Entities.System;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -66,12 +67,12 @@ namespace OASystem.Domain.ViewModels.System
         /// <summary>
         /// 手机号
         /// </summary>
-
+        [Encrypted]
         public string Phone { get; set; }
         /// <summary>
         /// 紧急联系人 手机号
         /// </summary>
-
+        [Encrypted]
         public string UrgentPhone { get; set; }
         /// <summary>
         /// 邮箱

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

@@ -1,6 +1,7 @@
 
 using AutoMapper;
 using OASystem.Domain;
+using OASystem.Domain.AesEncryption;
 using OASystem.Domain.Dtos.QiYeWeChat;
 using OASystem.Domain.Dtos.System;
 using OASystem.Domain.Dtos.UserDto;
@@ -112,7 +113,7 @@ namespace OASystem.Infrastructure.Repositories.Login
                 return result;
             }
 
-            Sys_Users _userInfo = new Sys_Users()
+            var _userInfo = new Sys_Users()
             {
                 CnName = registerDto.CnName,
                 EnName = registerDto.EnName,
@@ -150,6 +151,9 @@ namespace OASystem.Infrastructure.Repositories.Login
                 IsDel = 0
             };
 
+            //指定字段加密
+            EncryptionProcessor.EncryptProperties(_userInfo);
+
             var _AddId = await _sqlSugar.Insertable(_userInfo).ExecuteReturnIdentityAsync();
             if (_AddId < 0)
             {

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

@@ -1,5 +1,6 @@
 using AutoMapper;
 using OASystem.Domain;
+using OASystem.Domain.AesEncryption;
 using OASystem.Domain.Entities.System;
 using OASystem.Domain.ViewModels.System;
 using SqlSugar;
@@ -23,64 +24,20 @@ namespace OASystem.Infrastructure.Repositories.System
         /// <returns></returns>
         public async Task<Result> GetUserList(int portType,string sqlWhere)
         {
-            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();
-
+            Result result = new Result() { Code = -2, Msg = "暂无数据!" };
 
-            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.CnName,su.Number,su.Ext,su.Phone,su.UrgentPhone,su.Email
+            string userSqlWhere = string.Format(@"Select su.CompanyId, sc.CompanyName,su.DepId,sd.DepName,su.JobPostId,sjp.JobName,
+                                                        su.Id UserId,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 Where su.IsDel = 0");
-                var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
+            var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
 
-                if (_userList.Count != 0)
-                {
-                    result.Code = 0;
-                    result.Msg = "成功!";
-                    result.Data = _userList;
-                }
-                else
-                {
-                    result.Msg = "暂无数据!";
-                }
-            }
-            else if (portType == 2) //Android
+            if (portType == 1 || portType == 2 || portType == 3) //web、Android、ios
             {
-                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 ");
-
-                var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
+                //解密
+                foreach (var user in _userList) EncryptionProcessor.DecryptProperties(user);
 
                 if (_userList.Count != 0)
                 {
@@ -88,19 +45,7 @@ namespace OASystem.Infrastructure.Repositories.System
                     result.Msg = "成功!";
                     result.Data = _userList;
                 }
-                else
-                {
-                    result.Msg = "暂无数据!";
-                }
             }
-            else if (portType == 3) //IOS
-            {
-            }
-            else
-            {
-                result.Msg = "暂无数据!";
-            } 
-            
             return result;
         }
 
@@ -150,6 +95,7 @@ namespace OASystem.Infrastructure.Repositories.System
                                                         left Join Sys_Company sc On su.CompanyId = sc.Id
                                                         left Join Sys_Department sd On su.DepId = sd.Id
                                                         left Join Sys_JobPost sjp On su.JobPostId = sjp.Id {0}", sqlWhere);
+
             return await _sqlSugar.SqlQueryable<UserInfo>(sql).ToListAsync();
 
         }