瀏覽代碼

修改直接获取用户部门Code

TANG JIANG 2 年之前
父節點
當前提交
f18526fbcb
共有 1 個文件被更改,包括 4 次插入20 次删除
  1. 4 20
      src/Hotline.Api/Controllers/KnowledgeApplyController.cs

+ 4 - 20
src/Hotline.Api/Controllers/KnowledgeApplyController.cs

@@ -277,15 +277,11 @@ namespace Hotline.Api.Controllers
         [HttpPost("apply-allhandle")]
         public async Task<PagedDto<KnowledgeApplyPageDto>> AllHandle([FromQuery] KnowledgeHandlePagedDto dto)
         {
-            var orgUser = await _userRepository.GetAsync(p => p.Id == _sessionContext.RequiredUserId, HttpContext.RequestAborted);
-            if (orgUser is null)
-                throw UserFriendlyException.SameMessage("登录信息获取失败");
-
             var (total, items) = await _knowledgeApplyRepository
                  .Queryable()
                  .Includes(it => it.User)
                  .Includes(it => it.SystemOrganize)
-                 .Where(p => p.DepartmentCode == orgUser.OrgCode)
+                 .Where(p => p.DepartmentCode == _sessionContext.RequiredOrgCode)
                  .WhereIF(!string.IsNullOrEmpty(dto.CreateUserName), d => d.User.Name.Contains(dto.CreateUserName!))
                  .WhereIF(!string.IsNullOrEmpty(dto.CreateBMName), d => d.SystemOrganize.OrgName.Contains(dto.CreateBMName!))
                  .WhereIF(!string.IsNullOrEmpty(dto.ApplyType), d => d.KnowledgeApplyType.ToString() == dto.ApplyType)
@@ -308,15 +304,11 @@ namespace Hotline.Api.Controllers
         [HttpPost("apply-processinghandle")]
         public async Task<PagedDto<KnowledgeApplyPageDto>> ProcessingHandle([FromQuery] KnowledgeHandlePagedDto dto)
         {
-            var orgUser = await _userRepository.GetAsync(p => p.Id == _sessionContext.RequiredUserId, HttpContext.RequestAborted);
-            if (orgUser is null)
-                throw UserFriendlyException.SameMessage("登录信息获取失败");
-
             var (total, items) = await _knowledgeApplyRepository
                 .Queryable(false)
                 .Includes(it => it.User)
                 .Includes(it => it.SystemOrganize)
-                .Where(p => p.DepartmentCode == orgUser.OrgCode)
+                .Where(p => p.DepartmentCode == _sessionContext.RequiredOrgCode)
                 .Where(p => p.Status == EKnowledgeApplyStatus.Handling)
                 .WhereIF(!string.IsNullOrEmpty(dto.CreateUserName), d => d.User.Name.Contains(dto.CreateUserName!))
                 .WhereIF(!string.IsNullOrEmpty(dto.CreateBMName), d => d.SystemOrganize.OrgName.Contains(dto.CreateBMName!))
@@ -340,15 +332,11 @@ namespace Hotline.Api.Controllers
         [HttpPost("apply-endhandle")]
         public async Task<PagedDto<KnowledgeApplyPageDto>> EndHandle([FromQuery] KnowledgeHandlePagedDto dto)
         {
-            var orgUser = await _userRepository.GetAsync(p => p.Id == _sessionContext.RequiredUserId, HttpContext.RequestAborted);
-            if (orgUser is null)
-                throw UserFriendlyException.SameMessage("登录信息获取失败");
-
             var (total, items) = await _knowledgeApplyRepository
                .Queryable(false)
                .Includes(it => it.User)
                .Includes(it => it.SystemOrganize)
-               .Where(p => p.DepartmentCode == orgUser.OrgCode)
+               .Where(p => p.DepartmentCode == _sessionContext.RequiredOrgCode)
                .Where(p => p.Status == EKnowledgeApplyStatus.Succeed)
                .WhereIF(!string.IsNullOrEmpty(dto.CreateUserName), d => d.User.Name.Contains(dto.CreateUserName!))
                .WhereIF(!string.IsNullOrEmpty(dto.CreateBMName), d => d.SystemOrganize.OrgName.Contains(dto.CreateBMName!))
@@ -372,15 +360,11 @@ namespace Hotline.Api.Controllers
         [HttpPost("apply-returnhandle")]
         public async Task<PagedDto<KnowledgeApplyPageDto>> ReturnHandle([FromQuery] KnowledgeHandlePagedDto dto)
         {
-            var orgUser = await _userRepository.GetAsync(p => p.Id == _sessionContext.RequiredUserId, HttpContext.RequestAborted);
-            if (orgUser is null)
-                throw UserFriendlyException.SameMessage("登录信息获取失败");
-
             var (total, items) = await _knowledgeApplyRepository
                .Queryable(false)
                .Includes(it => it.User)
                .Includes(it => it.SystemOrganize)
-               .Where(p => p.DepartmentCode == orgUser.OrgCode)
+               .Where(p => p.DepartmentCode == _sessionContext.RequiredOrgCode)
                .Where(p => p.Status == EKnowledgeApplyStatus.Failed)
                .WhereIF(!string.IsNullOrEmpty(dto.CreateUserName), d => d.User.Name.Contains(dto.CreateUserName!))
                .WhereIF(!string.IsNullOrEmpty(dto.CreateBMName), d => d.SystemOrganize.OrgName.Contains(dto.CreateBMName!))