#328 1. 价格评审显示最终评标价

BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/review/composite/PriceEvaluationComposite.java

@@ -409,7 +409,7 @@ public class PriceEvaluationComposite extends Composite {
 					for(SupplierOpeningResult result : supplierOpeningResultList){
 						if(ObjectUtils.equals(result.getSupplierId(), supplier.getId())){
 							if(null == result.getEvaluationPrice()){
-								result.setEvaluationPrice(result.getBidPrice());
+								result.setEvaluationPrice(result.getEvaluationPrice());
 							}
 							supplierOpeningResult = result;
 							break;

com.gx.obe.common.widget/src/com/gx/obe/common/widget/dialog/EditSubBidPriceItemDialog.java

@@ -754,7 +754,7 @@ public class EditSubBidPriceItemDialog extends EDialog {
 					
 					BidPriceResult bidPriceResult = CollectionUtils.get(bidStructPriceResultList, t -> bidPriceList.get(0).getBidPriceCode().equals(t.getBidPriceCode()));
 					
-					if(bidPriceResult.getBidPriceCode().equals(curBidPriceResult.getBidPriceCode())) {
+					if(bidPriceResult != null && bidPriceResult.getBidPriceCode().equals(curBidPriceResult.getBidPriceCode())) {
 						bidPriceResult.setFinalBidPrice(curBidPriceResult.getFinalBidPrice());
 						bidPriceResult.setEvaluationPrice(curBidPriceResult.getEvaluationPrice());
 						bidPriceResult.setModifyReason(curBidPriceResult.getModifyReason());