Compare commits

..

No commits in common. '6746d063d4216ab32baf22fe6475e2f3aa233b00' and '9d4f45bbe9b2dd9247435ced7a1ad61724e4ca2f' have entirely different histories.

@ -99,10 +99,6 @@ namespace ZKLT.Hadoop
_wherestr.AppendLine(@$"AND `{_item.Name}` {_Itemv[k]} @{_guid}"); _wherestr.AppendLine(@$"AND `{_item.Name}` {_Itemv[k]} @{_guid}");
param.Add(_guid, $@"%{((JValue)_Colv[k]!).Value!}%"); param.Add(_guid, $@"%{((JValue)_Colv[k]!).Value!}%");
break; break;
case HDP_WhereType.IN:
_wherestr.AppendLine(@$"AND `{_item.Name}` {_Itemv[k]} @{_guid}");
param.Add(_guid, _Colv[k]!);
break;
case HDP_WhereType.QUERYIN: case HDP_WhereType.QUERYIN:
var _Command = JsonConvert.DeserializeObject<HDP_Command>(_Colv[k].ToString())!; var _Command = JsonConvert.DeserializeObject<HDP_Command>(_Colv[k].ToString())!;
var _Query = QueryString(_Command.SourceId!, _Command.TableId!, _Command.Where, _Command.Data, _Command.Order, _Command.Col, param); var _Query = QueryString(_Command.SourceId!, _Command.TableId!, _Command.Where, _Command.Data, _Command.Order, _Command.Col, param);
@ -114,10 +110,18 @@ namespace ZKLT.Hadoop
case HDP_WhereType.LESS: case HDP_WhereType.LESS:
case HDP_WhereType.MORETHEN: case HDP_WhereType.MORETHEN:
case HDP_WhereType.LESSTHEN: case HDP_WhereType.LESSTHEN:
case HDP_WhereType.IN:
case HDP_WhereType.BETWEEN: case HDP_WhereType.BETWEEN:
default: default:
_wherestr.AppendLine(@$"AND `{_item.Name}` {_Itemv[k]} @{_guid}"); _wherestr.AppendLine(@$"AND `{_item.Name}` {_Itemv[k]} @{_guid}");
if (_Colv[k]!.Type == JTokenType.Object || _data[_item.Name]!.Type == JTokenType.Array)
{
param.Add(_guid, _Colv[k]!);
}
else
{
param.Add(_guid, ((JValue)_Colv[k]!).Value!); param.Add(_guid, ((JValue)_Colv[k]!).Value!);
}
break; break;
} }
} }

Loading…
Cancel
Save