|
|
@@ -1101,7 +1101,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
-
|
|
|
string serverPath = $"{_url}{fileName}";
|
|
|
designer.Workbook.Save($"{_excelPath}/{fileName}");
|
|
|
|
|
|
@@ -1190,15 +1189,15 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
if (dto.GoodsId > 0) dto.GoodsName = string.Empty;
|
|
|
if (!string.IsNullOrEmpty(dto.GoodsName)) dto.GoodsId = 0;
|
|
|
|
|
|
- if (currUserId == 343) //陈湘OAId登录 只显示贵重物品审核信息
|
|
|
- {
|
|
|
- if (_goodsTypeIds.Any())
|
|
|
- {
|
|
|
- var newArray = typeLabel.ToList();
|
|
|
- newArray.AddRange(_goodsTypeIds);
|
|
|
- typeLabel = newArray.ToArray();
|
|
|
- }
|
|
|
- }
|
|
|
+ //if (currUserId == 343) //陈湘OAId登录 只显示贵重物品审核信息
|
|
|
+ //{
|
|
|
+ // if (_goodsTypeIds.Any())
|
|
|
+ // {
|
|
|
+ // var newArray = typeLabel.ToList();
|
|
|
+ // newArray.AddRange(_goodsTypeIds);
|
|
|
+ // typeLabel = newArray.ToArray();
|
|
|
+ // }
|
|
|
+ //}
|
|
|
|
|
|
var beginBool = DateTime.TryParse(!string.IsNullOrEmpty(dto.BeginDt) ? $"{dto.BeginDt} 00:00:00" : string.Empty, out var begin);
|
|
|
var endBool = DateTime.TryParse(!string.IsNullOrEmpty(dto.EndDt) ? $"{dto.EndDt} 00:00:00" : string.Empty, out var end);
|