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

字典bug修复

Browse Source
This commit is contained in:
hang
2022-04-15 09:35:31 +08:00
parent 67f41bd139
commit 4cbb37e1b5
4 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
+1 -1
View File
@@ -42,7 +42,7 @@ namespace IRaCIS.Application.Contracts
//有父亲 就有值
public Guid ParentId { get; set; }
public Guid? ParentId { get; set; }
public bool IsEnable { get; set; }
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
+20 -16
View File
@@ -59,26 +59,25 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateBasicDic(AddOrEditBasicDic addOrEditBasic)
{
if (addOrEditBasic.Id == null)
{
var entity = await _dicRepository.InsertDictionaryAsync(addOrEditBasic);
//if (addOrEditBasic.Id == null)
//{
// var entity = await _dicRepository.InsertDictionaryAsync(addOrEditBasic);
await _dicRepository.UpdateFromQueryAsync(t => t.ParentId == Guid.Empty,
u => new Dictionary() { ParentId = null });
// await _dicRepository.UpdateFromQueryAsync(t => t.ParentId == Guid.Empty,
// u => new Dictionary() { ParentId = null });
return ResponseOutput.Ok(entity.Id.ToString());
}
else
{
var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true);
await _dicRepository.UpdateFromQueryAsync(t => t.ParentId == Guid.Empty,
u => new Dictionary() { ParentId = null });
// return ResponseOutput.Ok(entity.Id.ToString());
//}
//else
//{
// var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true);
return ResponseOutput.Ok(entity.Id.ToString());
}
//var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true);
//return ResponseOutput.Ok(entity.Id.ToString());
// return ResponseOutput.Ok(entity.Id.ToString());
//}
var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true);
return ResponseOutput.Ok(entity.Id.ToString());
}
@@ -100,6 +99,11 @@ namespace IRaCIS.Application.Services
[HttpDelete("{id:guid}")]
public async Task<IResponseOutput> DeleteDictionary(Guid id)
{
if ( await _dicRepository.AnyAsync(t => t.ParentId == id))
{
return ResponseOutput.NotOk("有子项数据，不允许直接删除！");
}
if ((await _doctorDictionaryRepository.AnyAsync(t => t.DictionaryId == id)) ||
(await _doctorRepository.AnyAsync(t => t.SpecialityId == id || t.PositionId == id || t.DepartmentId == id || t.RankId == id))