|
|
@@ -1930,8 +1930,12 @@ class Approval extends Component {
|
|
|
}
|
|
|
|
|
|
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
|
|
|
}
|
|
|
if (mergeAble && !approval.isDBFind() && !approval.neerInput) {
|