|
@@ -5182,11 +5182,15 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
model.SeatEarlyWarningTypeValue = seatEarlyWarningTypeValue;
|
|
|
model.SeatEarlyWarningTypeName = seatEarlyWarningTypeName;
|
|
|
//预警预选信息
|
|
|
+ var exp = Expressionable.Create<EarlyWarningSetting>();
|
|
|
+ foreach (var item in intersect)
|
|
|
+ {
|
|
|
+ exp = exp.Or(x => SqlFunc.JsonListObjectAny(x.EarlyWarningRules, "SensitiveWord", item));
|
|
|
+ }
|
|
|
var query = _earlyWarningSettingRepository.Queryable()
|
|
|
- //.Where(x => intersect.Contains(SqlFunc.JsonField(x.EarlyWarningRules, "SensitiveWord")));
|
|
|
- .Where(x => SqlFunc.JsonListObjectAny(x.EarlyWarningRules, "SensitiveWord", intersect));
|
|
|
- Console.WriteLine(query.ToSqlString());
|
|
|
- var earlyList =await query.ToListAsync();
|
|
|
+ .Where(exp.ToExpression());
|
|
|
+
|
|
|
+ var earlyList = await query.ToListAsync();
|
|
|
|
|
|
model.CanChooseEarlyWarning = earlyList;
|
|
|
await _orderEarlyWarningRepository.AddAsync(model, cancellationToken);
|