|
@@ -98,8 +98,11 @@ namespace OASystem.Domain.ViewModels.Groups
|
|
|
|
|
|
if (val == 0 )
|
|
|
{
|
|
|
- int.TryParse(_newValue.ToString(), out int val1);
|
|
|
- OriginVal = val1.ToString();
|
|
|
+ if (_newValue != null)
|
|
|
+ {
|
|
|
+ int.TryParse(_newValue.ToString(), out int val1);
|
|
|
+ OriginVal = val1.ToString();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
OriginVal = val.ToString();
|
|
@@ -108,7 +111,13 @@ namespace OASystem.Domain.ViewModels.Groups
|
|
|
else if (FieldTypeName.Equals("单选按钮"))
|
|
|
{
|
|
|
var val = "无";
|
|
|
- if (OriginVal.Equals("有") || _newValue.ToString().Equals("有")) val = "有";
|
|
|
+ if (OriginVal.Equals("有")) val = "有";
|
|
|
+
|
|
|
+ if (_newValue != null)
|
|
|
+ {
|
|
|
+ if (_newValue.ToString().Equals("有")) val = "有";
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
OriginVal = val;
|
|
|
return val;
|