|
@@ -2633,8 +2633,25 @@ public class OrderController : BaseController
|
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
var data = _mapper.Map<List<OrderVisitDetailDto>>(items);
|
|
|
var isAdmin = _orderDomainService.IsCheckAdmin();
|
|
|
- data.ForEach(d => d.IsShowOperate = (dto.ScreenType == EOrderScreenType.Org && d.VisitOrgCode == _sessionContext.OrgId)
|
|
|
- || isAdmin == true || (dto.ScreenType == EOrderScreenType.Seat));
|
|
|
+ foreach (var item in data)
|
|
|
+ {
|
|
|
+ if ((dto.ScreenType == EOrderScreenType.Org && item.VisitOrgCode == _sessionContext.OrgId) || isAdmin == true || (dto.ScreenType == EOrderScreenType.Seat))
|
|
|
+ item.IsShowOperate = true;
|
|
|
+ if (_appOptions.Value.IsZiGong && !_sessionContext.OrgIsCenter)
|
|
|
+ {
|
|
|
+ var maskString = "***";
|
|
|
+ item.Order.Contact = maskString;
|
|
|
+ item.Order.FromName = maskString;
|
|
|
+ item.Order.FromGender = EGender.Unknown;
|
|
|
+ item.Order.FromPhone = maskString;
|
|
|
+ item.Order.FullAddress = maskString;
|
|
|
+ item.Order.Address = maskString;
|
|
|
+ item.Order.City = maskString;
|
|
|
+ item.Order.Street = maskString;
|
|
|
+ item.Order.ContactMask = maskString;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return new PagedDto<OrderVisitDetailDto>(total, data);
|
|
|
}
|
|
|
|
|
@@ -2692,7 +2709,13 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
var (total, items) = await _orderApplication.OrderScreenList(dto)
|
|
|
.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
- return new PagedDto<OrderScreenListDto>(total, _mapper.Map<IReadOnlyList<OrderScreenListDto>>(items));
|
|
|
+ var data = _mapper.Map<List<OrderScreenListDto>>(items);
|
|
|
+ if (_appOptions.Value.IsZiGong && !_sessionContext.OrgIsCenter)
|
|
|
+ {
|
|
|
+ data.ForEach(d => d.Order = d.Order.DataMask());
|
|
|
+ }
|
|
|
+
|
|
|
+ return new PagedDto<OrderScreenListDto>(total, data);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -4391,7 +4414,7 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
await _orderSnapshotRepository.Queryable()
|
|
|
.Where(m => m.Id == order.Id)
|
|
|
- .Select(m => new { m.IndustryId, m.IndustryName , m.IndustryCase})
|
|
|
+ .Select(m => new { m.IndustryId, m.IndustryName, m.IndustryCase })
|
|
|
.FirstAsync(HttpContext.RequestAborted)
|
|
|
.Then(async snapshot =>
|
|
|
{
|