From d98675a45ec201cc02434e447c6ded10d7731791 Mon Sep 17 00:00:00 2001 From: helongjun Date: Mon, 23 May 2022 15:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Document/SystemDocumentService.cs | 2 +- .../Service/Document/TrialDocumentService.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs b/IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs index 1eec37f32..9e0e520ce 100644 --- a/IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs @@ -114,7 +114,7 @@ namespace IRaCIS.Core.Application.Services if (await _repository.Where(t => t.Id == systemDocumentId).AnyAsync(u => u.SystemDocConfirmedUserList.Any())) { - return ResponseOutput.NotOk("已有用户阅读该文档，并签名。"); + return ResponseOutput.NotOk("已有用户阅读该文档，并签名，不允许删除。"); } var success = await _systemDocumentRepository.DeleteFromQueryAsync(t => t.Id == systemDocumentId,true,true); diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index a624c3fb3..df55832de 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -406,7 +406,7 @@ namespace IRaCIS.Core.Application.Services if (await _trialDocumentRepository.AnyAsync(t => t.FileTypeId == addOrEditTrialDocument.FileTypeId && t.Name == addOrEditTrialDocument.Name && t.TrialId == addOrEditTrialDocument.TrialId, true)) { - return ResponseOutput.NotOk("同类型已存在该文件名"); + return ResponseOutput.NotOk("该项目中已经存在同类型的同名文件。"); } //entity.Id = NewId.NextGuid(); @@ -417,7 +417,7 @@ namespace IRaCIS.Core.Application.Services { if (await _trialDocumentRepository.AnyAsync(t => t.FileTypeId == addOrEditTrialDocument.FileTypeId && t.Name == addOrEditTrialDocument.Name && t.Id != addOrEditTrialDocument.Id && t.TrialId == addOrEditTrialDocument.TrialId, true)) { - return ResponseOutput.NotOk("同类型已存在该文件名"); + return ResponseOutput.NotOk("该项目中已经存在同类型的同名文件。"); } var document = (await _trialDocumentRepository.Where(t => t.Id == addOrEditTrialDocument.Id, true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync()).IfNullThrowException(); @@ -468,7 +468,7 @@ namespace IRaCIS.Core.Application.Services { if (await _trialDocumentRepository.AsQueryable(true).Where(t => t.Id == trialDocumentId).AnyAsync(t => t.TrialDocConfirmedUserList.Any())) { - return ResponseOutput.NotOk("该文档，已有用户签名 不允许删除"); + return ResponseOutput.NotOk("已有用户阅读该文档，并签名，不允许删除。"); } var success = await _trialDocumentRepository.BatchDeleteNoTrackingAsync(t => t.Id == trialDocumentId); @@ -534,7 +534,7 @@ namespace IRaCIS.Core.Application.Services { if (await _repository.AnyAsync(t => t.SystemDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id)) { - return ResponseOutput.NotOk("该文档已经签名"); + return ResponseOutput.NotOk("该文件已经签名"); } if (!await _systemDocumentRepository.AnyAsync(t => t.Id == userConfirmCommand.DocumentId) || await _trialDocumentRepository.AnyAsync(t => t.Id == userConfirmCommand.DocumentId && t.IsDeleted, true)) { @@ -547,7 +547,7 @@ namespace IRaCIS.Core.Application.Services { if (await _repository.AnyAsync(t => t.TrialDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id)) { - return ResponseOutput.NotOk("该文档已经签名"); + return ResponseOutput.NotOk("该文件已经签名"); } if (!await _trialDocumentRepository.AnyAsync(t => t.Id == userConfirmCommand.DocumentId) || await _repository.AnyAsync(t => t.Id == userConfirmCommand.DocumentId && t.IsDeleted, true))