|
@@ -369,6 +369,21 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ var auditList = GoodsStorageConfirmAuditDep(1);
|
|
|
+ var hrAuditPer = false;
|
|
|
+ var finAuditPer = false;
|
|
|
+ var hrAuditInfo = auditList.FirstOrDefault(x => x.AuditDep == GoodsAuditDepEnum.Hr);
|
|
|
+ var finAuditInfo = auditList.FirstOrDefault(x => x.AuditDep == GoodsAuditDepEnum.Financial);
|
|
|
+ if (hrAuditInfo != null)
|
|
|
+ {
|
|
|
+ if (hrAuditInfo.AuditorIds.Any(x => x == userId)) hrAuditPer = true;
|
|
|
+ }
|
|
|
+ if (finAuditInfo != null)
|
|
|
+ {
|
|
|
+ if (finAuditInfo.AuditorIds.Any(x => x == userId)) finAuditPer = true;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
RefAsync<int> total = 0;
|
|
|
var data = await _sqlSugar.Queryable<Pm_GoodsStorage>()
|
|
|
.LeftJoin<Pm_GoodsInfo>((gs, gi) => gs.GoodsId == gi.Id)
|
|
@@ -379,6 +394,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
.WhereIF(auditLabel.Length > 0, (gs, gi, u, u1) => auditLabel.Contains((int)gs.ConfirmStatus))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.GoodsName), (gs, gi, u, u1) => gi.Name.Contains(dto.GoodsName))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.BatchNo), (gs, gi, u, u1) => gs.BatchNo.Contains(dto.BatchNo))
|
|
|
+ .WhereIF(finAuditPer, (gs, gi, u, u1) => _goodsTypeIds.Contains(gi.Type))
|
|
|
.Select((gs, gi, u, u1) => new GoodsStorageListView()
|
|
|
{
|
|
|
Id = gs.Id,
|
|
@@ -404,20 +420,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
.OrderByDescending(gs => gs.CreateTime)
|
|
|
.ToPageListAsync(dto.PageIndex, dto.PageSize, total);
|
|
|
|
|
|
- var auditList = GoodsStorageConfirmAuditDep(1);
|
|
|
- var hrAuditPer = false;
|
|
|
- var finAuditPer = false;
|
|
|
- var hrAuditInfo = auditList.FirstOrDefault(x => x.AuditDep == GoodsAuditDepEnum.Hr);
|
|
|
- var finAuditInfo = auditList.FirstOrDefault(x => x.AuditDep == GoodsAuditDepEnum.Financial);
|
|
|
- if (hrAuditInfo != null)
|
|
|
- {
|
|
|
- if (hrAuditInfo.AuditorIds.Any(x => x == userId)) hrAuditPer = true;
|
|
|
- }
|
|
|
- if (finAuditInfo != null)
|
|
|
- {
|
|
|
- if (finAuditInfo.AuditorIds.Any(x => x == userId)) finAuditPer = true;
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
foreach (var item in data)
|
|
|
{
|
|
|
var auditDeps = new List<GoodsStorageAuditPerView>();
|