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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-03-06 15:48:11 +08:00
parent 4ef67beafc 826a04ef31
commit 17f131cf63
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Document/SysFileTypeService.cs
View File

@ -64,7 +64,7 @@ public class SysFileTypeService(IRepository<SysFileType> _sysFileTypeRepository,
//启用的才进行更新 //启用的才进行更新
if (addOrEditSysFileType.Id != null && addOrEditSysFileType.IsEnable) if (addOrEditSysFileType.Id != null && addOrEditSysFileType.IsEnable)
{ {
await _trialFileTypeRepository.BatchUpdateNoTrackingAsync(t => t.SysFileTypeId == addOrEditSysFileType.Id, u => new TrialFileType() { Name = addOrEditSysFileType.Name, NameCN = addOrEditSysFileType.NameCN, }); await _trialFileTypeRepository.BatchUpdateNoTrackingAsync(t => t.SysFileTypeId == addOrEditSysFileType.Id, u => new TrialFileType() { Name = addOrEditSysFileType.Name, NameCN = addOrEditSysFileType.NameCN,ShowOrder=addOrEditSysFileType.ShowOrder });
} }
return ResponseOutput.Ok(entity.Id.ToString()); return ResponseOutput.Ok(entity.Id.ToString());

2
IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs
View File

@ -153,7 +153,7 @@ public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepos
result.Add(new TrialFileTypeData() result.Add(new TrialFileTypeData()
{ {
ArchiveTypeEnum = type, ArchiveTypeEnum = type,
TrialFileTypeList = trialFileTypeList.Where(x => x.ArchiveTypeEnum == type).OrderBy(x=>x.ShowOrder).ToList() TrialFileTypeList = trialFileTypeList.Where(x => x.ArchiveTypeEnum == type).OrderByDescending(x=>x.SysFileTypeId==null).ThenBy(x=>x.ShowOrder).ToList()
}); });
} }