Skip to content

Commit eec3688

Browse files
committed
Update CultureDto and SettingService
1 parent ad10856 commit eec3688

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

src/LinCms.Application.Contracts/Base/Localizations/CultureDto.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ namespace LinCms.Base.Localizations;
66
public class CultureDto : EntityDto<long>
77
{
88
[Required]
9-
[StringLength(10)]
9+
[StringLength(50,ErrorMessage = "名称最大长度为50")]
1010
public string Name { get; set; }
1111

1212
[Required]
13-
[StringLength(10)]
13+
[StringLength(50,ErrorMessage = "显示名称最大长度为50")]
1414
public string DisplayName { get; set; }
1515
}

src/LinCms.Application/Cms/Settings/SettingService.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ public async Task<string> GetOrNullAsync(string name, string providerName, strin
4545

4646
public async Task SetAsync(CreateUpdateSettingDto createSetting)
4747
{
48-
LinSetting setting = await _settingRepository.FindAsync(createSetting.Name, createSetting.ProviderName,createSetting.ProviderKey);
49-
48+
LinSetting setting = await _settingRepository.FindAsync(createSetting.Name, createSetting.ProviderName,
49+
createSetting.ProviderKey);
50+
5051
if (setting == null)
5152
{
5253
await _settingRepository.InsertAsync(Mapper.Map<LinSetting>(createSetting));
@@ -65,7 +66,9 @@ public async Task<SettingDto> GetAsync(Guid id)
6566

6667
public async Task<PagedResultDto<SettingDto>> GetPagedListAsync(PageDto pageDto)
6768
{
68-
List<SettingDto> list = (await _settingRepository.Select.ToPagerListAsync(pageDto, out long totalCount))
69+
List<SettingDto> list =
70+
(await _settingRepository.Select.OrderByDescending(r => r.CreateTime)
71+
.ToPagerListAsync(pageDto, out long totalCount))
6972
.Select(r => Mapper.Map<SettingDto>(r)).ToList();
7073

7174
return new PagedResultDto<SettingDto>(list, totalCount);
@@ -75,7 +78,7 @@ public async Task CreateAsync(CreateUpdateSettingDto createSettingDto)
7578
{
7679
LinSetting setting = await _settingRepository.FindAsync(createSettingDto.Name,
7780
createSettingDto.ProviderName, createSettingDto.ProviderKey);
78-
;
81+
7982
if (setting != null)
8083
{
8184
throw new LinCmsException("该配置已存在");

src/LinCms.Infrastructure/Repositories/SettingRepository.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99

1010
namespace LinCms.Repositories;
1111

12-
public class SettingRepository : AuditDefaultRepository<LinSetting,Guid,long>, ISettingRepository
12+
public class SettingRepository : AuditDefaultRepository<LinSetting, Guid, Guid>, ISettingRepository
1313
{
14-
public SettingRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser) : base(unitOfWorkManager, currentUser)
14+
public SettingRepository(UnitOfWorkManager unitOfWorkManager, ICurrentUser currentUser) : base(unitOfWorkManager,
15+
currentUser)
1516
{
1617
}
1718

@@ -26,6 +27,8 @@ public async Task<List<LinSetting>> GetListAsync(string providerName, string pro
2627
return await Select
2728
.Where(
2829
s => s.ProviderName == providerName && s.ProviderKey == providerKey
29-
).ToListAsync();
30+
)
31+
.OrderByDescending(r => r.CreateTime)
32+
.ToListAsync();
3033
}
3134
}

0 commit comments

Comments
 (0)