This commit is contained in:
qianhao.xu 2024-06-26 16:06:14 +08:00
parent fad7e978d4
commit 3bcccf89ca

View File

@ -56,7 +56,8 @@ namespace ZR.Service.MES.dev
.Select(it => it.FkInspectId.Value).ToArray();
var exp = Expressionable.Create<DeviceInspect>()
.AndIF(!string.IsNullOrEmpty(parm.Name),it=>it.Name.Contains(parm.Name));
.AndIF(!string.IsNullOrEmpty(parm.Name),it=>it.Name.Contains(parm.Name))
.And(it=>it.Status==1);
return Context.Queryable<DeviceInspect>()
.Where(it => !binded.Contains(it.Id))
.Where(exp.ToExpression())
@ -68,7 +69,8 @@ namespace ZR.Service.MES.dev
{
var exp = Expressionable.Create<DeviceRelAccountInspect, DeviceInspect>()
.AndIF(!string.IsNullOrEmpty(parm.Name), (r, i) => i.Name.Contains(parm.Name));
.AndIF(!string.IsNullOrEmpty(parm.Name), (r, i) => i.Name.Contains(parm.Name))
.And((r, i) => i.Status == 1);
// 获取绑定
return Context.Queryable<DeviceRelAccountInspect>()
.RightJoin<DeviceInspect>((r, i) => r.FkInspectId == i.Id)