用户增加工作语言，系统文档增加文档适用语言用户

2026-05-12 11:45:55 +08:00
parent 9ee85bfa3c
commit 577f35a3fe
31 changed files with 22500 additions and 45 deletions
@@ -207,7 +207,7 @@ namespace IRaCIS.Application.Contracts

        public bool IsTestUser { get; set; }

-
+        public UserWorkLanguage UserWorkLanguage { get; set; }
    }

    /// <summary>
@@ -338,6 +338,8 @@ namespace IRaCIS.Application.Contracts
        public Guid? AuditRecordId { get; set; }

        public bool? IsAuditRecordUserSelect { get; set; }
+
+        public UserWorkLanguage? UserWorkLanguage { get; set; }
    }

    public class UserRoleInfoDTO
@@ -534,6 +534,7 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource)
                 .WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == true, t => t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
                 .WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == false, t => !t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
+                  .WhereIf(inQuery.UserWorkLanguage != null, t => t.UserWorkLanguage == inQuery.UserWorkLanguage)
                 .ProjectTo<UserListDTO>(_mapper.ConfigurationProvider);

            var pageList = await userQueryable.ToPagedListAsync(inQuery);
@@ -1269,6 +1270,7 @@ namespace IRaCIS.Core.Application.Service
                PermissionStr = t.UserTypeRole.PermissionStr,
                UserName = t.IdentityUser.UserName,
                UserTypeShortName = t.UserTypeRole.UserTypeShortName,
+                UserWorkLanguage=t.IdentityUser.UserWorkLanguage
            }).FirstOrDefaultAsync();

            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = userTokenInfo.IdentityUserId, ActionUserName = $"{userTokenInfo.UserName}", ActionUserType = userTokenInfo.UserTypeShortName, OptType = UserOptType.LoginSelectRole }, true);