修改外部人员系统文档签署问题解决

2024-10-24 14:11:56 +08:00
parent 5ceb5e790a
commit 2c37765969
10 changed files with 49 additions and 65 deletions
@@ -143,8 +143,13 @@ namespace IRaCIS.Core.Application.Services
        [HttpPost]
        public async Task<PageOutput<UnionDocumentWithConfirmInfoView>> getWaitSignSysDocList(SystemDocumentQuery inQuery)
        {
+
+            var isInternal = _userInfo.IsZhiZhun;
+
            var query = from sysDoc in _systemDocumentRepository.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                    .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
+                    //外部人员 只签署 文档类型枚举值有值的
+                    .WhereIf(isInternal == false, t => t.FileType.Code.Length == 0)
                    .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
                        join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = _userInfo.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                        from confirm in cc.DefaultIfEmpty()