|
@@ -1163,6 +1163,16 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
if (dto.GoodsId > 0) dto.GoodsName = string.Empty;
|
|
|
if (!string.IsNullOrEmpty(dto.GoodsName)) dto.GoodsId = 0;
|
|
|
|
|
|
+ //财务人事审核权限处理
|
|
|
+ var auditList = GoodsStorageConfirmAuditDep(2);
|
|
|
+ bool hrAuditPer = false;
|
|
|
+ var hrAuditInfo = auditList.FirstOrDefault(x => x.AuditDep == GoodsAuditDepEnum.Hr);
|
|
|
+
|
|
|
+ if (hrAuditInfo.AuditorIds.Any(x => x == currUserId))
|
|
|
+ {
|
|
|
+ hrAuditPer = true;
|
|
|
+ }
|
|
|
+
|
|
|
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);
|
|
|
|
|
@@ -1181,6 +1191,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
.WhereIF(userLabel.Length > 0, (gr, gi, sd, u1, u2, di) => userLabel.Contains(gr.CreateUserId))
|
|
|
.WhereIF(groupLabel.Length > 0, (gr, gi, sd, u1, u2, di) => groupLabel.Contains(gr.GroupId))
|
|
|
.WhereIF(beginBool && endBool, (gr, gi, sd, u1, u2, di) => gr.CreateTime >= begin && gr.CreateTime <= end)
|
|
|
+ .WhereIF(hrAuditPer, (gr, gi, sd, u1, u2, di) => _goodsTypeIds.Contains(gi.Type))
|
|
|
.Select((gr, gi, sd, u1, u2, di) => new GoodsReceiveListMobileView
|
|
|
{
|
|
|
Id = gr.Id,
|
|
@@ -1242,21 +1253,9 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
return _jv;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- //财务人事审核权限处理
|
|
|
- var auditList = GoodsStorageConfirmAuditDep(2);
|
|
|
- bool hrAuditPer = false;
|
|
|
- var hrAuditInfo = auditList.FirstOrDefault(x => x.AuditDep == GoodsAuditDepEnum.Hr);
|
|
|
-
|
|
|
- if (hrAuditInfo.AuditorIds.Any(x => x == currUserId))
|
|
|
- {
|
|
|
- hrAuditPer = true;
|
|
|
- }
|
|
|
-
|
|
|
//返回分页数据
|
|
|
//领用审核List只显示多条审核数据 陈湘
|
|
|
- var view = await data.WhereIF(hrAuditPer, x => _goodsTypeIds.Contains(x.GoodsTypeId))
|
|
|
- .ToPageListAsync(dto.PageIndex, dto.PageSize, total);
|
|
|
+ var view = await data.ToPageListAsync(dto.PageIndex, dto.PageSize, total);
|
|
|
|
|
|
foreach (var item in view)
|
|
|
{
|