|
@@ -65,7 +65,7 @@ namespace VitalService.Service
|
|
|
PageIndex = request.PageIndex,
|
|
|
PageSize = request.PageSize,
|
|
|
Filter = filter,
|
|
|
- Sort = Builders<UserFeatureEntity>.Sort.Descending(x => x.CreateTime)
|
|
|
+ Sort = Builders<UserFeatureEntity>.Sort.Descending(x => x.CreateTime).Ascending(x => x.Code)
|
|
|
};
|
|
|
var result = await _userFeatureDBRepository.GetPages(pageFilter);
|
|
|
return result.MappingTo<PageCollection<UserFeatureDTO>>();
|
|
@@ -90,7 +90,7 @@ namespace VitalService.Service
|
|
|
public async Task<long> RemoveUserFeatureListAsync(RemoveUserFeatureListDBRequest request)
|
|
|
{
|
|
|
var filter = new List<(string key, string val)>();
|
|
|
- foreach(var code in request.Codes)
|
|
|
+ foreach (var code in request.Codes)
|
|
|
{
|
|
|
filter.Add(("Code", code));
|
|
|
}
|
|
@@ -104,7 +104,7 @@ namespace VitalService.Service
|
|
|
/// <returns></returns>
|
|
|
public async Task<List<UserFeatureDTO>> GetUserFeatureListAsync(GetUserFeatureListDBRequest request)
|
|
|
{
|
|
|
- var filter = Builders<UserFeatureEntity>.Filter.In(f=>f.Code, request.Codes);
|
|
|
+ var filter = Builders<UserFeatureEntity>.Filter.In(f => f.Code, request.Codes);
|
|
|
var result = await _userFeatureDBRepository.FindAllAsync(filter);
|
|
|
return result.MappingTo<List<UserFeatureDTO>>();
|
|
|
}
|
|
@@ -129,21 +129,21 @@ namespace VitalService.Service
|
|
|
public async Task<bool> UpdateUserFeatureAsync(UpdateUserFeatureDBRequest request)
|
|
|
{
|
|
|
var filter = Builders<UserFeatureEntity>.Filter.Eq(f => f.Code, request.Code);
|
|
|
- var update = Builders<UserFeatureEntity>.Update
|
|
|
- .Set(f => f.FeatureName, request.FeatureName)
|
|
|
- .Set(f => f.FeatureShowName, request.FeatureShowName)
|
|
|
- .Set(f => f.Description, request.Description)
|
|
|
- .Set(f => f.FatherCode, request.FatherCode)
|
|
|
- .Set(f => f.Sort, request.Sort)
|
|
|
- .Set(f => f.AppType, request.AppType)
|
|
|
+ var update = Builders<UserFeatureEntity>.Update
|
|
|
+ .Set(f => f.FeatureName, request.FeatureName)
|
|
|
+ .Set(f => f.FeatureShowName, request.FeatureShowName)
|
|
|
+ .Set(f => f.Description, request.Description)
|
|
|
+ .Set(f => f.FatherCode, request.FatherCode)
|
|
|
+ .Set(f => f.Sort, request.Sort)
|
|
|
+ .Set(f => f.AppType, request.AppType)
|
|
|
.Set(f => f.FeatureType, request.FeatureType);
|
|
|
-
|
|
|
+
|
|
|
return await _userFeatureDBRepository.UpdateOneAsync(filter, update) > 0;
|
|
|
}
|
|
|
|
|
|
private async Task<UserFeatureDTO> ConvertToDTO(UserFeatureEntity entity)
|
|
|
{
|
|
|
- if(entity == null) return null;
|
|
|
+ if (entity == null) return null;
|
|
|
var dto = entity.MappingTo<UserFeatureDTO>();
|
|
|
return dto;
|
|
|
}
|