XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Uat_Study
hang 2022-09-22 11:05:22 +08:00
parent d9442b6eeb
commit fa5ca11a18
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
View File

@ -119,10 +119,10 @@ namespace IRaCIS.Application.Services
//} //}
//if (addOrEditBasic.Id != null ) if (addOrEditBasic.Id != null && addOrEditBasic.ParentId!=null)
//{ {
// await _dicRepository.BatchUpdateNoTrackingAsync(t => t.ParentId == addOrEditBasic.Id, c => new Dictionary() { DataTypeEnum = addOrEditBasic.DataTypeEnum }); await _dicRepository.UpdatePartialFromQueryAsync(t => t.ParentId == addOrEditBasic.Id, c => new Dictionary() { DataTypeEnum = addOrEditBasic.DataTypeEnum });
//} }
var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true, verifyExp1); var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true, verifyExp1);

6
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -502,7 +502,7 @@ namespace IRaCIS.Core.Application.Services
success = await _repository.SaveChangesAsync(); success = await _repository.SaveChangesAsync();
return ResponseOutput.Result(success); return ResponseOutput.Ok(success);
} }
[HttpPut("{documentId:guid}")] [HttpPut("{documentId:guid}")]
@ -543,7 +543,7 @@ namespace IRaCIS.Core.Application.Services
if (userConfirmCommand.isSystemDoc) if (userConfirmCommand.isSystemDoc)
{ {
if (await _repository.AnyAsync<SystemDocConfirmedUser>(t => t.SystemDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id)) if (await _repository.AnyAsync<SystemDocConfirmedUser>(t => t.SystemDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null))
{ {
return ResponseOutput.NotOk("该文件已经签名"); return ResponseOutput.NotOk("该文件已经签名");
} }
@ -558,7 +558,7 @@ namespace IRaCIS.Core.Application.Services
} }
else else
{ {
if (await _repository.AnyAsync<TrialDocUserTypeConfirmedUser>(t => t.TrialDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id)) if (await _repository.AnyAsync<TrialDocUserTypeConfirmedUser>(t => t.TrialDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id && t.ConfirmTime !=null))
{ {
return ResponseOutput.NotOk("该文件已经签名"); return ResponseOutput.NotOk("该文件已经签名");
} }