Commit 53663581 authored by liudong1993's avatar liudong1993

1

parent 63248a44
......@@ -6612,10 +6612,17 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
}
else
{
if (!MyUnderlingList.Contains(item.CreateBy) && item.CreateBy != userInfo.Id)
{
if ((UserLookList.Where(x => x.CreateBy == item.CreateBy).FirstOrDefault()?.IsLock ?? 0) == 1)
{
item.IsNotLook = 1;
}
}
if (item.IsDefaultPermission == 2)
{
item.IsLock = 1;
if (!MyUnderlingList.Contains(item.CreateBy))
if (!MyUnderlingList.Contains(item.CreateBy) && item.CreateBy != userInfo.Id)
{
item.IsNotLook = 1;
}
......@@ -6683,10 +6690,17 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
}
else
{
if (!MyUnderlingList.Contains(item.CreateBy) && item.CreateBy != userInfo.Id)
{
if ((UserLookList.Where(x => x.CreateBy == item.CreateBy).FirstOrDefault()?.IsLock ?? 0) == 1)
{
item.IsNotLook = 1;
}
}
if (item.IsDefaultPermission == 2)
{
item.IsLock = 1;
if (!MyUnderlingList.Contains(item.CreateBy))
if (!MyUnderlingList.Contains(item.CreateBy) && item.CreateBy != userInfo.Id)
{
item.IsNotLook = 1;
}
......@@ -6911,10 +6925,17 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
}
else
{
if (!MyUnderlingList.Contains(item.CreateBy) && item.CreateBy != userInfo.Id)
{
if ((UserLookList.Where(x => x.CreateBy == item.CreateBy).FirstOrDefault()?.IsLock ?? 0) == 1)
{
item.IsNotLook = 1;
}
}
if (item.IsDefaultPermission == 2)
{
item.IsLock = 1;
if (!MyUnderlingList.Contains(item.CreateBy))
if (!MyUnderlingList.Contains(item.CreateBy) && item.CreateBy != userInfo.Id)
{
item.IsNotLook = 1;
}
......@@ -7089,10 +7110,17 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
}
else
{
if (!MyUnderlingList.Contains(item.CreateBy) && item.CreateBy != userInfo.Id)
{
if ((UserLookList.Where(x => x.CreateBy == item.CreateBy).FirstOrDefault()?.IsLock ?? 0) == 1)
{
item.IsNotLook = 1;
}
}
if (item.IsDefaultPermission == 2)
{
item.IsLock = 1;
if (!MyUnderlingList.Contains(item.CreateBy))
if (!MyUnderlingList.Contains(item.CreateBy) && item.CreateBy != userInfo.Id)
{
item.IsNotLook = 1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment