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

DataModules/DealPaymentDm.dfm

@@ -11,6 +11,7 @@ object DealPaymentData: TDealPaymentData
   end
   object sddDealPayment: TsdDataSet
     Active = False
+    Filtered = False
     Provider = sdpDealPayment
     BeforeAddRecord = sddDealPaymentBeforeAddRecord
     AfterAddRecord = sddDealPaymentAfterAddRecord

DataModules/DealPaymentDm.pas

@@ -557,8 +557,10 @@ begin
   begin
     Rec := sddDealPayment.Records[I];
     if Rec.ValueByName('CalcType').AsInteger <> 0 then Continue;
-    Rec.ValueByName('StartedPrice').AsFloat := FPayFormula.Calculate(Rec.ValueByName('SFormula').AsString);
-    Rec.ValueByName('RangePrice').AsFloat := FPayFormula.Calculate(Rec.ValueByName('RFormula').AsString);
+    if Rec.ValueByName('SFormula').AsString <> '' then
+      Rec.ValueByName('StartedPrice').AsFloat := FPayFormula.Calculate(Rec.ValueByName('SFormula').AsString);
+    if Rec.ValueByName('RFormula').AsString <> '' then
+      Rec.ValueByName('RangePrice').AsFloat := FPayFormula.Calculate(Rec.ValueByName('RFormula').AsString);
   end;
 end;