Merge branch 'master' of http://192.168.1.12:3000/MaiXinRong/Measure

DataModules/DealPaymentDm.pas

@@ -762,7 +762,7 @@ end;
 procedure TDealPaymentData.sdvDealPaymentBeforeAddRecord(
   ARecord: TsdDataRecord; var Allow: Boolean);
 begin
-  Allow := (ARecord.ValueByName('Name').AsString <> '') or (not VarIsNull(ARecord.ValueByName('Name').CachedValue));
+  Allow := VarToStrDef(ARecord.ValueByName('Name').CachedValue, '') <> '';
 end;
 
 end.