|
@@ -3023,7 +3023,6 @@ FROM
|
|
gr.IsDel = 0
|
|
gr.IsDel = 0
|
|
) Temp ");
|
|
) Temp ");
|
|
|
|
|
|
-
|
|
|
|
var isValueable = false;
|
|
var isValueable = false;
|
|
if (currUserId == 343) //陈湘OAId登录 只显示贵重物品审核信息
|
|
if (currUserId == 343) //陈湘OAId登录 只显示贵重物品审核信息
|
|
{
|
|
{
|
|
@@ -3070,7 +3069,6 @@ FROM
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
|
|
-
|
|
|
|
foreach (var item in view)
|
|
foreach (var item in view)
|
|
{
|
|
{
|
|
var details = $"暂无物品信息数据";
|
|
var details = $"暂无物品信息数据";
|
|
@@ -3141,8 +3139,32 @@ FROM
|
|
item.StatusDesc = text.ToString();
|
|
item.StatusDesc = text.ToString();
|
|
}
|
|
}
|
|
|
|
|
|
- //权限前台验证
|
|
|
|
- if (item.IsValuable) item.AuditPers = valuableAuditUsers.ToArray();
|
|
|
|
|
|
+
|
|
|
|
+ //多情况下审核、操作权限验证
|
|
|
|
+ if (item.GoodsTypeId == 0)
|
|
|
|
+ {
|
|
|
|
+ int tempId = 2;
|
|
|
|
+ if (item.IsValuable) tempId = 3;
|
|
|
|
+
|
|
|
|
+ item.IsAuditPer = await _approvalProcessRep.VerifyAuditAuthAsync(tempId, 1, item.Id, currUserId);
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ if (item.AuditStatus == GoodsAuditEnum.Pending)
|
|
|
|
+ {
|
|
|
|
+ item.IsAuditPer = normAuditTemps?.TempNodes.FirstOrDefault()?.NodeUsers.Any(x => x.UserId == currUserId) ?? false;
|
|
|
|
+ }
|
|
|
|
+ else if (item.AuditStatus == GoodsAuditEnum.OutConfirming)
|
|
|
|
+ {
|
|
|
|
+ item.IsAuditPer = valuableAuditTemps?.TempNodes.FirstOrDefault(x=> x.NodeOrder == 1)?.NodeUsers.Any(x => x.UserId == currUserId) ?? false;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //前端权限验证
|
|
|
|
+ if (item.IsValuable)
|
|
|
|
+ {
|
|
|
|
+ item.AuditPers = valuableAuditUsers.ToArray();
|
|
|
|
+ }
|
|
else item.AuditPers = normAuditUsers.ToArray();
|
|
else item.AuditPers = normAuditUsers.ToArray();
|
|
}
|
|
}
|
|
|
|
|