From 153dbd2016d3e64a14307fda6bddc95d0b321b59 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 6 Mar 2025 13:12:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Document/TrialFileTypeService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs b/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs index 32f568111..8fff2c9f3 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs @@ -153,7 +153,7 @@ public class TrialFileTypeService(IRepository _trialFileTypeRepos result.Add(new TrialFileTypeData() { 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).ThenBy(x=>x.ShowOrder).ToList() }); } From 104b1208ed3ac077343f03f75fca71999dbc0e3d Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 6 Mar 2025 14:34:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Document/SysFileTypeService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Document/SysFileTypeService.cs b/IRaCIS.Core.Application/Service/Document/SysFileTypeService.cs index 06aa56afc..9acd25c4e 100644 --- a/IRaCIS.Core.Application/Service/Document/SysFileTypeService.cs +++ b/IRaCIS.Core.Application/Service/Document/SysFileTypeService.cs @@ -64,7 +64,7 @@ public class SysFileTypeService(IRepository _sysFileTypeRepository, //启用的才进行更新 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()); From 826a04ef3101b34a2717021d739b85a56df56447 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 6 Mar 2025 14:38:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Document/TrialFileTypeService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs b/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs index 8fff2c9f3..04f2fdac8 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs @@ -153,7 +153,7 @@ public class TrialFileTypeService(IRepository _trialFileTypeRepos result.Add(new TrialFileTypeData() { ArchiveTypeEnum = type, - TrialFileTypeList = trialFileTypeList.Where(x => x.ArchiveTypeEnum == type).OrderByDescending(x=>x.SysFileTypeId).ThenBy(x=>x.ShowOrder).ToList() + TrialFileTypeList = trialFileTypeList.Where(x => x.ArchiveTypeEnum == type).OrderByDescending(x=>x.SysFileTypeId==null).ThenBy(x=>x.ShowOrder).ToList() }); }