lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-09-20 02:29:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitee.com/dotnetchina/OpenAuth.Net into main

Browse Source
This commit is contained in:
yubaolee
2021-03-09 23:36:19 +08:00
parent 80c38c26d7 96362550c7
commit f7088c9d29
4 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
OpenAuth.App/Flow/FlowLine.cs
View File

@@ -6,6 +6,7 @@
// <summary>流程中的连线</summary>
using System.Collections.Generic;
using Infrastructure.Extensions;
using Newtonsoft.Json.Linq;
namespace OpenAuth.App.Flow
@@ -31,27 +32,39 @@ namespace OpenAuth.App.Flow
bool result = true;
foreach (var compare in Compares)
{
decimal value = decimal.Parse(compare.Value); //参考值
decimal frmvalue = decimal.Parse(frmDataJson.GetValue(compare.FieldName.ToLower()).ToString()); //表单中填写的值
switch (compare.Operation)
bool isDecimal = decimal.TryParse(compare.Value, out decimal value);
var fieldVal = frmDataJson.GetValue(compare.FieldName.ToLower()).ToString();
if (isDecimal) //如果是数字或小数
{
case DataCompare.Equal:
result &= compare.Value == frmDataJson.GetValue(compare.FieldName).ToString();
break;
case DataCompare.Larger:
result &= frmvalue > value;
break;
case DataCompare.Less:
result &= frmvalue < value;
break;
case DataCompare.LargerEqual:
result &= frmvalue <= value;
break;
case DataCompare.LessEqual:
result &= frmvalue <= value;
break;
decimal frmvalue = decimal.Parse(fieldVal); //表单中填写的值
switch (compare.Operation)
{
case DataCompare.Equal:
result &= compare.Value == fieldVal;
break;
case DataCompare.Larger:
result &= frmvalue > value;
break;
case DataCompare.Less:
result &= frmvalue < value;
break;
case DataCompare.LargerEqual:
result &= frmvalue <= value;
break;
case DataCompare.LessEqual:
result &= frmvalue <= value;
break;
}
}
else //如果只是字符串，只判断相等
{
result &= compare.Value == fieldVal;
}
}
return result;