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

修改

Uat_Study
hang 2023-04-04 13:54:28 +08:00
parent cf03ff62e7
commit a7e7f19c6c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -1514,7 +1514,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
var origenalTask = (await _visitTaskRepository.Where(t => item.OriginalReReadingTaskId == t.Id).FirstOrDefaultAsync()).IfNullThrowException(); var origenalTask = (await _visitTaskRepository.Where(t => item.OriginalReReadingTaskId == t.Id).FirstOrDefaultAsync()).IfNullThrowException();
if (origenalTask.TaskState != TaskState.Effect) if ( (origenalTask.TaskState != TaskState.Effect|| origenalTask.TaskState != TaskState.Freeze))
{ {
//---当前申请重阅任务的状态，已被其他任务重阅已影响，不允许对该状态下的任务进行重阅同意与否操作 //---当前申请重阅任务的状态，已被其他任务重阅已影响，不允许对该状态下的任务进行重阅同意与否操作
return ResponseOutput.NotOk(_localizer["VisitTask_ReapplyStatusConflict"]); return ResponseOutput.NotOk(_localizer["VisitTask_ReapplyStatusConflict"]);

1
IRaCIS.Core.Application/Service/Common/SystemMonitor.cs
View File

@ -245,6 +245,7 @@ namespace IRaCIS.Core.Application.Service.Common
{ {
PreserveReferencesHandling = PreserveReferencesHandling.All, PreserveReferencesHandling = PreserveReferencesHandling.All,
Formatting = Formatting.Indented, Formatting = Formatting.Indented,
}; };
dynamic data = JsonConvert.DeserializeObject(json, settings); dynamic data = JsonConvert.DeserializeObject(json, settings);