|
@@ -1908,7 +1908,7 @@ class Approval extends Component {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if(!isObjNull(newValues)) continue
|
|
|
|
|
|
|
+ if(!isObjEmpty(newValues)) continue
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if ((!isObjNull(caption)) && (caption == 'ID' || caption == 'id')) {
|
|
if ((!isObjNull(caption)) && (caption == 'ID' || caption == 'id')) {
|
|
@@ -1973,8 +1973,8 @@ class Approval extends Component {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
approval.data2Values()
|
|
approval.data2Values()
|
|
|
- if ((!approval.neerInput && isObjEmpty(approval.values)) || !showAble
|
|
|
|
|
- || approval.values == 'null' || approval.values == '(null)') {
|
|
|
|
|
|
|
+ if (approval.dfType!='FF' &&((!approval.neerInput && isObjEmpty(approval.values)) || !showAble
|
|
|
|
|
+ || approval.values == 'null' || approval.values == '(null)')) {
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
if (mergeAble && !approval.isDBFind() && !approval.neerInput) {
|
|
if (mergeAble && !approval.isDBFind() && !approval.neerInput) {
|