|
@@ -51,12 +51,12 @@ namespace OASystem.Domain.ViewModels.Groups
|
|
|
|
|
|
if (FieldTypeName.Equals("文本"))
|
|
|
{
|
|
|
+ if (OriginVal.Equals("-")) return _newValue;
|
|
|
+
|
|
|
return OriginVal;
|
|
|
}
|
|
|
else if (FieldTypeName.Equals("搜索框"))
|
|
|
{
|
|
|
-
|
|
|
-
|
|
|
if (_newValue != null)
|
|
|
{
|
|
|
|
|
@@ -95,13 +95,21 @@ namespace OASystem.Domain.ViewModels.Groups
|
|
|
else if (FieldTypeName.Equals("下拉选择框") || FieldTypeName.Equals("复选框") || FieldTypeName.Equals("数字"))
|
|
|
{
|
|
|
int.TryParse(OriginVal, out int val);
|
|
|
+
|
|
|
+ if (val == 0 )
|
|
|
+ {
|
|
|
+ int.TryParse(_newValue.ToString(), out int val1);
|
|
|
+ OriginVal = val1.ToString();
|
|
|
+ }
|
|
|
+
|
|
|
OriginVal = val.ToString();
|
|
|
return val;
|
|
|
}
|
|
|
else if (FieldTypeName.Equals("单选按钮"))
|
|
|
{
|
|
|
var val = "无";
|
|
|
- if (OriginVal.ToUpper().Equals("TRUE") || OriginVal.Equals("有")) val = "有";
|
|
|
+ if (OriginVal.Equals("有") || _newValue.ToString().Equals("有")) val = "有";
|
|
|
+
|
|
|
OriginVal = val;
|
|
|
return val;
|
|
|
}
|