|
|
|
@ -421,8 +421,9 @@ namespace Myshipping.Application
|
|
|
|
|
.WhereIF(input.EDELETETIME != null, u => u.DeleteTime < input.EDELETETIME.Value.AddDays(1))
|
|
|
|
|
.WhereIF(saleUserList != null && saleUserList.Count > 0, o => saleUserList.Contains(o.SALEID))
|
|
|
|
|
.WhereIF(opUserList != null && opUserList.Count > 0, o => opUserList.Contains(o.OPID))
|
|
|
|
|
.WhereIF(userlist != null && userlist.Count() > 0, u => userlist.Contains((long)u.CreatedUserId)
|
|
|
|
|
|| UserManager.UserId.ToString() == u.ROUTEID || UserManager.Name.ToString() == u.ROUTE ||
|
|
|
|
|
.WhereIF(userlist != null && userlist.Count() > 0, u => userlist.Contains((long)u.CreatedUserId) ||
|
|
|
|
|
UserManager.UserId.ToString() == u.ROUTEID || UserManager.Name.ToString() == u.ROUTE ||
|
|
|
|
|
UserManager.UserId.ToString() == u.LineManageID || UserManager.Name.ToString() == u.LineManage ||
|
|
|
|
|
UserManager.UserId.ToString() == u.SALEID || UserManager.Name.ToString() == u.SALE ||
|
|
|
|
|
userlistString.Contains(u.OPID) || UserManager.Name.ToString() == u.OP ||
|
|
|
|
|
userlistString.Contains(u.DOCID) || UserManager.Name.ToString() == u.DOC ||
|
|
|
|
@ -451,7 +452,7 @@ namespace Myshipping.Application
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
var entities = await query.ToPagedListAsync(input.PageNo, input.PageSize);
|
|
|
|
|
|
|
|
|
|
//var sql = query.ToSqlString();
|
|
|
|
|
if (traceTime)
|
|
|
|
|
{
|
|
|
|
|
var et = DateTime.Now - ticks;
|
|
|
|
@ -1067,12 +1068,11 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
var rightlist = await _right.GetDataScopeList(MenuConst.MenuBookingOrder, true);
|
|
|
|
|
|
|
|
|
|
//除现有配置权限外 操作和本人具有编辑权限
|
|
|
|
|
//除现有配置权限外 创建人本人、操作、单证、客服 具有编辑权限
|
|
|
|
|
if (rightlist != null && !(
|
|
|
|
|
mlist.OPID == UserManager.UserId.ToString() || mlist.OP == UserManager.Name.ToString() ||
|
|
|
|
|
mlist.DOCID == UserManager.UserId.ToString() || mlist.DOC == UserManager.Name.ToString() ||
|
|
|
|
|
mlist.CUSTSERVICEID == UserManager.UserId.ToString() || mlist.CUSTSERVICE == UserManager.Name.ToString() ||
|
|
|
|
|
mlist.ROUTEID == UserManager.UserId.ToString() || mlist.ROUTE == UserManager.Name.ToString() ||
|
|
|
|
|
UserManager.UserId == 400234750476357 ||
|
|
|
|
|
mlist.CreatedUserId.ToString() == UserManager.UserId.ToString() ||
|
|
|
|
|
rightlist.Contains((long)mlist.CreatedUserId)
|
|
|
|
|